From: Michael Frank Signed-off-by: Michael Frank --- Makefile.in | 107 +++++--------------------------------------------- 1 file changed, 12 insertions(+), 95 deletions(-) Patch file: --- scilab-4.1/Makefile.in.orig 2006-12-11 12:41:55.000000000 +0000 +++ scilab-4.1/Makefile.in 2006-12-17 12:10:10.000000000 +0000 @@ -1,19 +1,5 @@ SHELL = /bin/sh -binary: - @if test -f .binary; then \ - echo "Humm... this is a binary version"; \ - config/findpath; \ - (cd scripts; make); \ - echo "Installation done"; \ - else \ - echo "***************************************"; \ - echo "Humm... this is a source version."; \ - echo "Please read the README_Unix file first."; \ - echo "***************************************"; \ - fi - -#SCIDIR=. include Path.incl include Makefile.incl @@ -125,31 +111,17 @@ $(SCIBASE)/pvm3/bin/@PVMARCH@/* BINDISTFILES = \ - $(SCIBASE)/.binary \ - $(SCIBASE)/.pvmd.conf \ - $(SCIBASE)/ACKNOWLEDGEMENTS \ - $(SCIBASE)/CHANGES \ - $(SCIBASE)/Makefile \ - $(SCIBASE)/Makefile.OBJ \ $(SCIBASE)/Makefile.incl \ - $(SCIBASE)/Makemex \ - $(SCIBASE)/Path.incl \ - $(SCIBASE)/README_Unix \ - $(SCIBASE)/RELEASE_NOTES \ - $(SCIBASE)/SVN_revision.incl \ $(SCIBASE)/Version.incl \ $(SCIBASE)/configure \ - $(SCIBASE)/libtool \ - $(SCIBASE)/license.txt \ - $(SCIBASE)/licence.txt \ $(SCIBASE)/scilab.quit \ $(SCIBASE)/scilab.star \ $(SCIBASE)/X11_defaults \ $(SCIBASE)/bin \ - $(SCIBASE)/config \ + $(SCIBASE)/config/Makeso.incl \ + $(SCIBASE)/libtool \ $(SCIBASE)/contrib \ $(SCIBASE)/demos \ - $(SCIBASE)/examples \ $(SCIBASE)/imp/NperiPos.ps \ $(SCIBASE)/imp/giffonts \ $(SCIBASE)/macros \ @@ -181,13 +153,6 @@ $(SCIBASE)/tcl \ $(SCIBASE)/util -tarbindist: - touch .binary - @STRIP@ bin/scilex - cd examples; make distclean - cd .. ; tar cvf $(SCIBASE)/$(SCIBASE)-bin.tar $(BINDISTFILES) @PVMINST@ - $(RM) .binary - #------------------------------------------------- # installation # Scilab is installed in $(PREFIX)/lib/SCIBASE @@ -210,28 +175,15 @@ pvm3/bin/@PVMARCH@/* INSTBINDISTFILES = \ - .pvmd.conf \ - ACKNOWLEDGEMENTS \ - CHANGES \ - Makefile \ - Makefile.OBJ \ Makefile.incl \ - Makemex \ - Path.incl \ - README_Unix \ - Version.incl \ - configure \ libtool \ - license.txt \ - licence.txt \ scilab.quit \ scilab.star \ X11_defaults \ bin \ - config \ + config/Makeso.incl \ contrib \ demos \ - examples \ imp/NperiPos.ps \ imp/giffonts \ macros \ @@ -262,49 +214,14 @@ DOCNAME=$(SCIBASE) install: - @if test `pwd`/.. != $(PREFIX)/lib ; then \ - install -d $(PREFIX)/lib/$(SCIBASE); \ - ( for file in $(INSTBINDISTFILES) @PVMINST1@; do tar cf - $${file} | (cd $(PREFIX)/lib/$(SCIBASE); tar xf -); done); \ - (cd $(PREFIX)/lib/$(SCIBASE);touch .binary; make postinstall PREFIX=$(PREFIX) ) \ - fi - install -d $(PREFIX)/share/doc/$(DOCNAME)/ + install -d ${D}$(PREFIX)/lib/$(SCIBASE); \ + ( for file in $(INSTBINDISTFILES) $(INSTPVMBINDISTFILES) $(INSTPVMBINDISTFILES1); do tar cf - $${file} | (cd ${D}$(PREFIX)/lib/$(SCIBASE); tar xf -); done); + + install -d ${D}$(PREFIX)/share/doc/$(DOCNAME)/ install ACKNOWLEDGEMENTS CHANGES README_Unix Version.incl \ - licence.txt license.txt $(PREFIX)/share/doc/$(DOCNAME) - install -d $(PREFIX)/bin - $(RM) $(PREFIX)/bin/scilab - ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/scilab $(PREFIX)/bin/scilab - $(RM) $(PREFIX)/bin/intersci - ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/intersci $(PREFIX)/bin/intersci - $(RM) $(PREFIX)/bin/intersci-n - ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/intersci-n $(PREFIX)/bin/intersci-n - -# DESTDIR is the final destination of the file -# it can be different from $(PREFIX)/lib -# when we use package builders for rpm or deb files - -DESTDIR=$(PREFIX)/lib - -postinstall: - @echo "creating Path.incl SCIDIR=$(DESTDIR)/$(SCIBASE)" - @echo "SCIDIR=$(DESTDIR)/$(SCIBASE)" > Path.incl - @cd scripts; make - @cd examples ; make distclean > /dev/null - @cp contrib/loader.sce contrib-loader.sce - @$(RM) -f -r contrib - @mkdir contrib - @mv contrib-loader.sce contrib/loader.sce - @find man -name "*.xml" -print0 | xargs -0 $(RM) - @@STRIP@ bin/scilex; - -uninstall: - $(RM) -r $(PREFIX)/$(SCIBASE) - $(RM) $(PREFIX)/bin/scilab - $(RM) $(PREFIX)/bin/intersci - $(RM) $(PREFIX)/bin/intersci-n - -cvsclean:: - @$(RM) -f -r geci xless wless xmetanet routines/comm routines/libcomm - @cd man; $(RM) -f -r arma comm control dcd elementary fileio functions graphics gui identification linear metanet nonlinear polynomials programming pvm robust scicos signal sound strings tdcs time-date tclsci translation utilities + licence.txt license.txt ${D}$(PREFIX)/share/doc/$(DOCNAME) + install -d ${D}$(PREFIX)/bin + ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/scilab ${D}$(PREFIX)/bin/scilab + ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/intersci ${D}$(PREFIX)/bin/intersci + ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/intersci-n ${D}$(PREFIX)/bin/intersci-n -setversion : - echo "SCIVERSION=Scilab-4.1-SVN-`date --iso`" > Version.incl