diff -Naur --exclude='*~' E/Makefile E.fink/Makefile --- E/Makefile 2015-03-18 12:07:38.000000000 +0100 +++ E.fink/Makefile 2015-07-15 09:39:36.000000000 +0200 @@ -5,7 +5,7 @@ # Author: Stephan Schulz # # Top level make file. Check Makefile.vars for system-dependend tool -# selection and compilation options. +# selection and compilation options. # # Changes # @@ -37,7 +37,7 @@ # Generate dependencies -depend: +depend: for subdir in $(CODE); do\ cd $$subdir; touch Makefile.dependencies; $(MAKE) depend; cd ..;\ done; @@ -86,7 +86,7 @@ $(TAR) cfX - $(PROJECT)/etc/NO_DISTRIB $(PROJECT) |$(GZIP) - -c > $(PROJECT).tgz # Include the GIT subdirecctories (and non-GPL files, of which there -# currently are none). +# currently are none). fulldistrib: man documentation cleandist default_config @echo "Warning: You are building a full archive!" @@ -111,7 +111,7 @@ $(LN) ../$$subdir/$$subdir.a .;\ done; -tags: +tags: etags */*.c */*.h cd PYTHON; make ptags @@ -122,7 +122,7 @@ # Rebuilding from scratch rebuild: - echo 'Rebuilding with debug options $(DEBUGFLAGS)' + echo 'Rebuilding with debug options $(DEBUGFLAGS)' $(MAKE) clean $(MAKE) config $(MAKE) depend @@ -130,7 +130,7 @@ # Configure the whole package -config: +config: echo 'Configuring build system and tools' $(MAKE) links $(MAKE) tools @@ -140,19 +140,19 @@ # Configure and copy executables to the installation directory install: top - -sh -c 'mkdir -p $(EXECPATH)' - -sh -c 'development_tools/e_install PROVER/eprover $(EXECPATH)' - -sh -c 'development_tools/e_install PROVER/epclextract $(EXECPATH)' - -sh -c 'development_tools/e_install PROVER/eproof $(EXECPATH)' - -sh -c 'development_tools/e_install PROVER/eproof_ram $(EXECPATH)' - -sh -c 'development_tools/e_install PROVER/eground $(EXECPATH)' - -sh -c 'development_tools/e_install PROVER/e_ltb_runner $(EXECPATH)' - -sh -c 'development_tools/e_install PROVER/e_axfilter $(EXECPATH)' - -sh -c 'development_tools/e_install PROVER/checkproof $(EXECPATH)' - -sh -c 'development_tools/e_install PROVER/ekb_create $(EXECPATH)' - -sh -c 'development_tools/e_install PROVER/ekb_delete $(EXECPATH)' - -sh -c 'development_tools/e_install PROVER/ekb_ginsert $(EXECPATH)' - -sh -c 'development_tools/e_install PROVER/ekb_insert $(EXECPATH)' + -sh -c 'mkdir -p $(DESTDIR)$(EXECPATH)' + -sh -c 'development_tools/e_install PROVER/eprover $(DESTDIR)$(EXECPATH)' + -sh -c 'development_tools/e_install PROVER/epclextract $(DESTDIR)$(EXECPATH)' + -sh -c 'development_tools/e_install PROVER/eproof $(DESTDIR)$(EXECPATH)' + -sh -c 'development_tools/e_install PROVER/eproof_ram $(DESTDIR)$(EXECPATH)' + -sh -c 'development_tools/e_install PROVER/eground $(DESTDIR)$(EXECPATH)' + -sh -c 'development_tools/e_install PROVER/e_ltb_runner $(DESTDIR)$(EXECPATH)' + -sh -c 'development_tools/e_install PROVER/e_axfilter $(DESTDIR)$(EXECPATH)' + -sh -c 'development_tools/e_install PROVER/checkproof $(DESTDIR)$(EXECPATH)' + -sh -c 'development_tools/e_install PROVER/ekb_create $(DESTDIR)$(EXECPATH)' + -sh -c 'development_tools/e_install PROVER/ekb_delete $(DESTDIR)$(EXECPATH)' + -sh -c 'development_tools/e_install PROVER/ekb_ginsert $(DESTDIR)$(EXECPATH)' + -sh -c 'development_tools/e_install PROVER/ekb_insert $(DESTDIR)$(EXECPATH)' -sh -c 'mkdir -p $(MANPATH)' -sh -c 'development_tools/e_install DOC/man/eprover.1 $(MANPATH)' -sh -c 'development_tools/e_install DOC/man/epclextract.1 $(MANPATH)' @@ -196,4 +196,3 @@ for subdir in $(CODE); do\ cd $$subdir;touch Makefile.dependencies;$(MAKE);cd ..;\ done; -