Changeset 25624 for branches/eam_branches/20090715/extsrc/gpcsw/Make.Common.fixed

Timestamp:

Sep 27, 2009, 11:34:07 AM (17 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/20090715/extsrc/gpcsw/Make.Common.fixed (modified) (2 diffs)

branches/eam_branches/20090715/extsrc/gpcsw/Make.Common.fixed

@@ -670 +670 @@
 $(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 $@
@@ -677 +677 @@
 $(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 $@