From 76b107c539c65e7aaffa334b8ea3b3602408a22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net> Date: Fri, 17 Apr 1998 23:28:50 -0700 Subject: [PATCH] fixed to support 'shared' dir in a sane way, because make verify stopped working... Rev: lib/master.pike.in:1.12 Rev: src/Makefile.in:1.78 --- lib/master.pike.in | 14 ++++++++------ src/Makefile.in | 30 +++++++++++++++++++----------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/lib/master.pike.in b/lib/master.pike.in index 60ad26afe0..a1e0846ad1 100644 --- a/lib/master.pike.in +++ b/lib/master.pike.in @@ -1,4 +1,4 @@ -/* $Id: master.pike.in,v 1.11 1998/04/17 21:48:36 mirar Exp $ +/* $Id: master.pike.in,v 1.12 1998/04/18 06:28:09 hubbe Exp $ * * Master-file for Pike. * @@ -506,17 +506,18 @@ void _main(string *orig_argv, string *env) add_constant("write",_static_modules.files()->_stdout->write); - _master_file_name=backtrace()[-1][0]; - q=explode_path(_master_file_name); // add path for architecture-shared files - add_include_path("�data_prefix�/include"); - add_module_path("�data_prefix�/modules"); + add_include_path("�share_prefix�/include"); + add_module_path("�share_prefix�/modules"); // add path for architecture-dependant files add_include_path("�lib_prefix�/include"); add_module_path("�lib_prefix�/modules"); + _master_file_name=backtrace()[-1][0]; +#if 0 + q=explode_path(_master_file_name); // add path for wherever the master is now add_include_path(pike_library_path+"/include"); add_module_path(pike_library_path+"/modules"); @@ -528,6 +529,7 @@ void _main(string *orig_argv, string *env) add_program_path(getcwd()); add_module_path(getcwd()); +#endif _master_file_name=combine_path(getcwd(), _master_file_name); @@ -555,7 +557,7 @@ void _main(string *orig_argv, string *env) ({"warnings",tmp->NO_ARG,({"-w","--warnings"})}), ({"ignore",tmp->HAS_ARG,"-ms"}), ({"debug",tmp->MAY_HAVE_ARG,"--debug",0,1}), - ({"trace",tmp->MAY_HAVE_ARG,"--trace",0,1}), + ({"trace",tmp->MAY_HAVE_ARG,"--trace",0,1}), ({"ignore",tmp->MAY_HAVE_ARG,"-Dqdatpl",0,1}) }), 1); diff --git a/src/Makefile.in b/src/Makefile.in index fa8bc259e5..aea9eb0925 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,5 +1,5 @@ # -# $Id: Makefile.in,v 1.77 1998/04/17 21:53:21 mirar Exp $ +# $Id: Makefile.in,v 1.78 1998/04/18 06:28:50 hubbe Exp $ # # This line is needed on some machines. @@ -72,7 +72,7 @@ AR=@AR@ LD=@LD@ LDFLAGS=$(CFLAGS) @LDFLAGS@ @LINKFORSHARED@ -RUNPIKE=$(TMP_BUILDDIR)/pike -m$(TMP_LIBDIR)/master.pike -M$(LIBDIR_SRC)/modules -I$(LIBDIR_SRC)/include $(PIKEOPTS) +RUNPIKE=$(TMP_BUILDDIR)/pike -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS) MOST_MAKE_FLAGS = "prefix=$(prefix)" "exec_prefix=$(exec_prefix)" "CC=$(CC)" "TMP_BINDIR=$(TMP_BINDIR)" "DEFINES=$(DEFINES)" "TMP_LIBDIR=$(TMP_LIBDIR)" "RUNPIKE=$(RUNPIKE)" "INSTALL=$(INSTALL)" "NOOPTFLAGS=$(NOOPTFLAGS)" "AR=$(AR)" MAKE_FLAGS = $(MOST_MAKE_FLAGS) "OTHERFLAGS=$(OTHERFLAGS)" @@ -181,13 +181,13 @@ compile_interpret : force force : # install -install: +install: pike hilfe @echo @echo Installing Pike... @echo @echo "Creating directories..."; \ for d in "$(prefix)" "$(exec_prefix)" "$(prefix)/lib" \ - "$(lib_prefix)" "$(prefix)/share" "$(share_prefix)" \ + "$(lib_prefix)" "$(share_prefix)" \ "$(prefix)/include" "$(prefix)/include/pike"; do \ if [ -d "$$d/." ]; then : ; else \ echo "$$d"; \ @@ -313,7 +313,7 @@ verify_modules: module_testsuites: ( cd modules ; $(MAKE) $(MAKE_FLAGS) testsuites ) -verify: module_testsuites testsuite +verify: module_testsuites testsuite master.pike $(RUNPIKE) $(TMP_BINDIR)/test_pike.pike modules/*/module_testsuite testsuite check: verify @@ -321,14 +321,14 @@ check: verify sure: verify # verify / debug verbose -verbose_verify: module_testsuites testsuite +verbose_verify: module_testsuites testsuite master.pike $(RUNPIKE) $(TMP_BINDIR)/test_pike.pike --verbose modules/*/module_testsuite testsuite # verify & debug VERBOSE -gdb_verify: module_testsuites testsuite +gdb_verify: module_testsuites testsuite master.pike @echo >.gdbinit handle SIGFPE nostop noprint pass @echo >>.gdbinit handle SIGUSR1 nostop noprint pass - @echo >>.gdbinit run -Mmodules -DNOT_INSTALLED -m$(TMP_LIBDIR)/master.pike $(PIKEOPTS) $(TMP_BINDIR)/test_pike.pike testsuite -v -v -f modules/*/module_testsuite + @echo >>.gdbinit run -m$(TMP_BUILDDIR)/master.pike $(PIKEOPTS) $(TMP_BINDIR)/test_pike.pike testsuite -v -v -f modules/*/module_testsuite gdb ./pike @rm .gdbinit @@ -355,11 +355,16 @@ lib: $(LIBDIR_SRC)/master.pike.in Makefile ln -s "$(LIBDIR_SRC)" ./share || exit 1; \ fi @echo "Creating lib/master.pike"; \ - ( sed -e 's!�exec_prefix�!$(exec_prefix)!' <$(LIBDIR_SRC)/master.pike.in \ - >./lib/master.pike && chmod 644 ./lib/master.pike) || exit 1 + ( sed -e 's!�lib_prefix�!$(lib_prefix)!' <$(LIBDIR_SRC)/master.pike.in \ + | sed -e 's!�share_prefix�!$(share_prefix)!' >./lib/master.pike && chmod 644 ./lib/master.pike) || exit 1 @echo "Done." -@touch ./lib 2>/dev/null || (touch lib/.broken_gnu_touch && rm lib/.broken_gnu_touch) + +master.pike: $(LIBDIR_SRC)/master.pike.in + sed -e 's!�lib_prefix�!$(TMP_LIBDIR)!' <$(LIBDIR_SRC)/master.pike.in \ + | sed -e 's!�share_prefix�!$(LIBDIR_SRC)!' >master.pike + # make export archive (requires compiled Pike) # Do not compile in source tree if you want to use this! # Beware that export archive this includes bison/yacc/byacc source @@ -372,6 +377,9 @@ full_export: new_peep_engine $(SRCDIR)/language.c $(SRCDIR)/language.h depend chmod +x $(SRCDIR)/install-sh $(RUNPIKE) $(TMP_BINDIR)/export.pike +all_exports: full_export + ( cd .. ; $(TMP_BINDIR)/makedists ) + bin_export: PATH=$(TMP_BINDIR)/fakes:$$PATH INSTALL_LOG=`pwd`/log make install INSTALL=install $(RUNPIKE) $(TMP_BINDIR)/parse_install_log <log $(SRCDIR) $(prefix) @@ -403,7 +411,7 @@ lobotomize_crypto: # # Pike internal targets # -module_objects: machine.h global.h modules/static_module_makefile modules/dynamic_module_makefile $(SRCDIR)/language.h lib +module_objects: machine.h global.h modules/static_module_makefile modules/dynamic_module_makefile $(SRCDIR)/language.h lib master.pike @( cd modules ; rm remake >/dev/null 2>&1 || : ; \ ${MAKE} $(MAKE_FLAGS) || \ ( test -f remake && ${MAKE} $(MAKE_FLAGS) ) ) || exit $$? -- GitLab