diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2005-10-24 21:32:57 +0200 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2005-10-25 10:36:39 +0000 |
| commit | 2c38b89b23afe1c5cf2287ecd6f0b15d00117c3b (patch) | |
| tree | 7537b1dd817760fb8da0fb1f9774e3143b1a98ce | |
| parent | 7ea75b6170327bc14c03f69e90eb8c7d3cb91382 (diff) | |
| download | perl-2c38b89b23afe1c5cf2287ecd6f0b15d00117c3b.tar.gz | |
remove mv-if-diff
Message-ID: <20051024193257.2022ea0d@grubert.mandrakesoft.com>
(with tweak to add rm for opmini.c, remove mv-if-diff, and reflect
this removal in MANIFEST)
p4raw-id: //depot/perl@25842
| -rw-r--r-- | MANIFEST | 1 | ||||
| -rw-r--r-- | Makefile.SH | 17 | ||||
| -rw-r--r-- | mv-if-diff | 15 |
3 files changed, 6 insertions, 27 deletions
@@ -2254,7 +2254,6 @@ mpeix/mpeix.c MPE/iX port mpeix/mpeixish.h MPE/iX port mpeix/nm MPE/iX port mpeix/relink MPE/iX port -mv-if-diff Script to mv a file if it changed myconfig.SH Prints summary of the current configuration NetWare/bat/Buildtype.bat NetWare port NetWare/bat/SetCodeWar.bat NetWare port diff --git a/Makefile.SH b/Makefile.SH index 8184f8741d..dd95528e4e 100644 --- a/Makefile.SH +++ b/Makefile.SH @@ -424,8 +424,7 @@ $spitshell >>Makefile <<!GROK!THIS! # levels of symbolic links, even if we have only two) opmini.c: op.c - \$(CPS) op.c opmini.tmp - sh mv-if-diff opmini.tmp opmini.c + \$(CPS) op.c opmini.c opmini\$(OBJ_EXT): opmini.c \$(CCCMD) \$(PLDLFLAGS) $DPERL_EXTERNAL_GLOB opmini.c @@ -436,8 +435,7 @@ miniperlmain$(OBJ_EXT): miniperlmain.c patchlevel.h $(CCCMD) $(PLDLFLAGS) $*.c perlmain.c: miniperlmain.c config.sh $(FIRSTMAKEFILE) - sh writemain $(DYNALOADER) $(static_ext) > writemain.tmp - sh mv-if-diff writemain.tmp perlmain.c + sh writemain $(DYNALOADER) $(static_ext) > perlmain.c !NO!SUBS! case "$osname" in @@ -511,8 +509,7 @@ PERLEXPORT = perl.exp esac $spitshell >>Makefile <<'!NO!SUBS!' perl.exp: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) - ./$(MINIPERLEXP) makedef.pl PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" | sort -u | sort -f > perl.exp.tmp - sh mv-if-diff perl.exp.tmp perl.exp + ./$(MINIPERLEXP) makedef.pl PLATFORM=aix CC_FLAGS="$(OPTIMIZE)" | sort -u | sort -f > perl.exp !NO!SUBS! ;; @@ -521,8 +518,7 @@ os2) MINIPERLEXP = miniperl perl5.def: $(MINIPERLEXP) makedef.pl config.sh $(SYM) $(SYMH) miniperl.map - ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl.exp.tmp - sh mv-if-diff perl.exp.tmp perl5.def + ./$(MINIPERLEXP) makedef.pl PLATFORM=os2 -DPERL_DLL=$(PERL_DLL) CC_FLAGS="$(OPTIMIZE)" > perl.exp !NO!SUBS! ;; @@ -772,11 +768,10 @@ lib/Config.pod: config.sh miniperl$(EXE_EXT) configpm Porting/Glossary $(CONFIGPM): lib/Config.pod lib/ExtUtils/Miniperl.pm: miniperlmain.c miniperl$(EXE_EXT) minimod.pl $(CONFIGPM) - $(LDLIBPTH) ./miniperl minimod.pl > minimod.tmp - sh mv-if-diff minimod.tmp $@ + $(LDLIBPTH) ./miniperl minimod.pl > lib/ExtUtils/Miniperl.pm lib/re.pm: ext/re/re.pm - cp ext/re/re.pm ext/re/re.tmp && sh mv-if-diff ext/re/re.tmp lib/re.pm + cp ext/re/re.pm lib/re.pm $(plextract): miniperl$(EXE_EXT) $(CONFIGPM) x2p/s2p @-rm -f $@ diff --git a/mv-if-diff b/mv-if-diff deleted file mode 100644 index 4a85b98392..0000000000 --- a/mv-if-diff +++ /dev/null @@ -1,15 +0,0 @@ -: mv-if-diff file1 file2 -: move file1 to file2 if file1 and file2 are different. - -if test $# -lt 2 ; then - echo "usage: $0 file1 file2" - echo "move file1 to file2 if file1 and file2 are different." - exit 1 -fi -if cmp $1 $2 >/dev/null 2>&1; then - echo "File $2 not changed." - rm -f $1 -else - rm -f $2 - mv $1 $2 -fi |