Changeset 31150

Timestamp:

Apr 4, 2011, 12:53:59 PM (15 years ago)

Author:

eugene

Message:

fixed for a more reliable build (eg, reduce gnu-specific names)

Location:

trunk/extsrc/gpcsw

Files:

• Make.Common.fixed (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• gpcsrc/Make.Common (modified) (2 diffs)

trunk/extsrc/gpcsw/Make.Common.fixed

@@ -130 +130 @@
 PATH     := .:$(DIR_GNU)/bin:$(DIR_BIN):/usr/local/bin:/usr/5bin:/usr/bin:/bin:/usr/ucb:$(PATH)
 SHELL    = /bin/sh
-INSTALL  = ginstall
+# INSTALL  = ginstall
+INSTALL  = install
 INSTSTRIP= $(INSTALL) -s
 TAR      = gtar

trunk/extsrc/gpcsw/Makefile.in

@@ -50 +50 @@
         cp -f burntool.nopsf/psfstats.c gpcsrc/fits/burntool
 
+# replace master Make.Common with the modified Make.Common.fixed
+        cp -f Make.Common.fixed gpcsrc/Make.Common
+
 # set up links
         ln -sf ../Make.Common gpcsrc/analysis/Make.Common

trunk/extsrc/gpcsw/gpcsrc/Make.Common

@@ -130 +130 @@
 PATH     := .:$(DIR_GNU)/bin:$(DIR_BIN):/usr/local/bin:/usr/5bin:/usr/bin:/bin:/usr/ucb:$(PATH)
 SHELL    = /bin/sh
-INSTALL  = ginstall
+# INSTALL  = ginstall
+INSTALL  = install
 INSTSTRIP= $(INSTALL) -s
 TAR      = gtar
 AR       = ar
-FC       = g77
+FC       = gfortran
 CC       = gcc
 LD       = gcc
@@ -670 +671 @@
 $(DIR_BIN)/%:   $(DIR_BIN)/%-$(VERSION)
         @echo "--> Installing link to $(notdir $<) as $(notdir $@)"
-        @-mv $@ $@.$(shell date +%H%M%S).TEXT_FILE_BUSY 2> /dev/null || /bin/true
-        @-rm -f $(DIR_BIN)/*.TEXT_FILE_BUSY 2> /dev/null || /bin/true
+        @-mv $@ $@.$(shell date +%H%M%S).TEXT_FILE_BUSY 2> /dev/null || true
+        @-rm -f $(DIR_BIN)/*.TEXT_FILE_BUSY 2> /dev/null || true
         @ln $< $@
-        @-setuidinst $@
+        # @-setuidinst $@
 
 $(DIR_BIN)/%-$(VERSION): scripts/%.sh
         @echo "--> Installing sh script $(notdir $@)"
-        @-mv $@ $@.$(shell date +%H%M%S).TEXT_FILE_BUSY 2> /dev/null || /bin/true
+        @-mv $@ $@.$(shell date +%H%M%S).TEXT_FILE_BUSY 2> /dev/null || true
         @$(INSTALL) -m 0555 $< $@ || ( rm -f $@ && exit 1 )
 
 $(DIR_BIN)/%-$(VERSION): $(EXECNAME)
         @echo "--> Installing program $(notdir $@)"
-        @-mv $@ $@.$(shell date +%H%M%S).TEXT_FILE_BUSY 2> /dev/null || /bin/true
+        @-mv $@ $@.$(shell date +%H%M%S).TEXT_FILE_BUSY 2> /dev/null || true
         @$(INSTSTRIP) -m 0755 $< $@ || ( rm -f $@ && exit 1 )
         @chmod 0555 $@