revi-archive/xz-archive
1
0
Fork 0
mirror of https://git.tukaani.org/xz.git synced 2024-04-04 12:36:23 +02:00
Code Activity

Use sed instead of $(SED) so that we don't need to

Browse source 
use AC_PROG_SED. We don't do anything fancy with sed,
so this should work OK. libtool 2.2 sets SED but 1.5
doesn't, so $(SED) happened to work when using libtool 2.2.
This commit is contained in:
Lasse Collin 2009-07-06 10:36:04 +03:00
parent 96e4b257e1
commit 5f16ef4abf
4 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/liblzma/Makefile.am
View file

@ -70,7 +70,7 @@ endif
# Remove ordinals from the generated .def file. People must link by name, # Remove ordinals from the generated .def file. People must link by name,
# not by ordinal, because no one is going to track the ordinal numbers. # not by ordinal, because no one is going to track the ordinal numbers.
liblzma.def: liblzma.la liblzma.def.in liblzma.def: liblzma.la liblzma.def.in
$(SED) 's/ \+@ *[0-9]\+//' liblzma.def.in > liblzma.def sed 's/ \+@ *[0-9]\+//' liblzma.def.in > liblzma.def
# Creating liblzma.def.in is a side effect of linking the library. # Creating liblzma.def.in is a side effect of linking the library.
liblzma.def.in: liblzma.la liblzma.def.in: liblzma.la

28
src/scripts/Makefile.am
View file

@ -10,42 +10,42 @@ dist_man_MANS = xzdiff.1 xzgrep.1 xzmore.1 xzless.1
install-exec-hook: install-exec-hook:
cd $(DESTDIR)$(bindir) && \ cd $(DESTDIR)$(bindir) && \
target=`echo xzdiff | $(SED) '$(transform)'` && \ target=`echo xzdiff | sed '$(transform)'` && \
for name in xzcmp lzdiff lzcmp; do \ for name in xzcmp lzdiff lzcmp; do \
link=`echo $$name | $(SED) '$(transform)'` && \ link=`echo $$name | sed '$(transform)'` && \
rm -f $$link && \ rm -f $$link && \
$(LN_S) $$target $$link; \ $(LN_S) $$target $$link; \
done && \ done && \
target=`echo xzgrep | $(SED) '$(transform)'` && \ target=`echo xzgrep | sed '$(transform)'` && \
for name in xzegrep xzfgrep lzgrep lzegrep lzfgrep; do \ for name in xzegrep xzfgrep lzgrep lzegrep lzfgrep; do \
link=`echo $$name | $(SED) '$(transform)'` && \ link=`echo $$name | sed '$(transform)'` && \
rm -f $$link && \ rm -f $$link && \
$(LN_S) $$target $$link; \ $(LN_S) $$target $$link; \
done && \ done && \
for name in xzmore xzless; do \ for name in xzmore xzless; do \
target=`echo $$name | $(SED) '$(transform)'` && \ target=`echo $$name | sed '$(transform)'` && \
link=`echo $$name | $(SED) 's/xz/lz/;$(transform)'` && \ link=`echo $$name | sed 's/xz/lz/;$(transform)'` && \
rm -f $$link && \ rm -f $$link && \
$(LN_S) $$target $$link; \ $(LN_S) $$target $$link; \
done done
install-data-hook: install-data-hook:
cd $(DESTDIR)$(mandir)/man1 && \ cd $(DESTDIR)$(mandir)/man1 && \
target=`echo xzdiff | $(SED) '$(transform)'` && \ target=`echo xzdiff | sed '$(transform)'` && \
for name in xzcmp lzdiff lzcmp; do \ for name in xzcmp lzdiff lzcmp; do \
link=`echo $$name | $(SED) '$(transform)'` && \ link=`echo $$name | sed '$(transform)'` && \
rm -f $$link.1 && \ rm -f $$link.1 && \
$(LN_S) $$target.1 $$link.1; \ $(LN_S) $$target.1 $$link.1; \
done && \ done && \
target=`echo xzgrep | $(SED) '$(transform)'` && \ target=`echo xzgrep | sed '$(transform)'` && \
for name in xzegrep xzfgrep lzgrep lzegrep lzfgrep; do \ for name in xzegrep xzfgrep lzgrep lzegrep lzfgrep; do \
link=`echo $$name | $(SED) '$(transform)'` && \ link=`echo $$name | sed '$(transform)'` && \
rm -f $$link.1 && \ rm -f $$link.1 && \
$(LN_S) $$target.1 $$link.1; \ $(LN_S) $$target.1 $$link.1; \
done && \ done && \
for name in xzmore xzless; do \ for name in xzmore xzless; do \
target=`echo $$name | $(SED) '$(transform)'` && \ target=`echo $$name | sed '$(transform)'` && \
link=`echo $$name | $(SED) 's/xz/lz/;$(transform)'` && \ link=`echo $$name | sed 's/xz/lz/;$(transform)'` && \
rm -f $$link.1 && \ rm -f $$link.1 && \
$(LN_S) $$target.1 $$link.1; \ $(LN_S) $$target.1 $$link.1; \
done done
@ -54,12 +54,12 @@ uninstall-hook:
cd $(DESTDIR)$(bindir) && \ cd $(DESTDIR)$(bindir) && \
for name in xzcmp lzdiff lzcmp xzegrep xzfgrep \ for name in xzcmp lzdiff lzcmp xzegrep xzfgrep \
lzgrep lzegrep lzfgrep lzmore lzless; do \ lzgrep lzegrep lzfgrep lzmore lzless; do \
link=`echo $$name | $(SED) '$(transform)'` && \ link=`echo $$name | sed '$(transform)'` && \
rm -f $$link; \ rm -f $$link; \
done done
cd $(DESTDIR)$(mandir)/man1 && \ cd $(DESTDIR)$(mandir)/man1 && \
for name in xzcmp lzdiff lzcmp xzegrep xzfgrep \ for name in xzcmp lzdiff lzcmp xzegrep xzfgrep \
lzgrep lzegrep lzfgrep lzmore lzless; do \ lzgrep lzegrep lzfgrep lzmore lzless; do \
link=`echo $$name | $(SED) '$(transform)'` && \ link=`echo $$name | sed '$(transform)'` && \
rm -f $$link.1; \ rm -f $$link.1; \
done done

6
src/xz/Makefile.am
View file

@ -64,9 +64,9 @@ xzlinks = unxz xzcat lzma unlzma lzcat
install-exec-hook: install-exec-hook:
cd $(DESTDIR)$(bindir) && \ cd $(DESTDIR)$(bindir) && \
target=`echo xz | $(SED) '$(transform)'`$(EXEEXT) && \ target=`echo xz | sed '$(transform)'`$(EXEEXT) && \
for name in $(xzlinks); do \ for name in $(xzlinks); do \
link=`echo $$name | $(SED) '$(transform)'` && \ link=`echo $$name | sed '$(transform)'` && \
rm -f $$link && \ rm -f $$link && \
$(LN_S) $$target $$link; \ $(LN_S) $$target $$link; \
done done
@ -74,6 +74,6 @@ install-exec-hook:
uninstall-hook: uninstall-hook:
cd $(DESTDIR)$(bindir) && \ cd $(DESTDIR)$(bindir) && \
for name in $(xzlinks); do \ for name in $(xzlinks); do \
link=`echo $$name | $(SED) '$(transform)'` && \ link=`echo $$name | sed '$(transform)'` && \
rm -f $$link; \ rm -f $$link; \
done done

6
src/xzdec/Makefile.am
View file

@ -50,12 +50,12 @@ dist_man_MANS = xzdec.1
install-data-hook: install-data-hook:
cd $(DESTDIR)$(mandir)/man1 && \ cd $(DESTDIR)$(mandir)/man1 && \
target=`echo xzdec | $(SED) '$(transform)'` && \ target=`echo xzdec | sed '$(transform)'` && \
link=`echo lzmadec | $(SED) '$(transform)'` && \ link=`echo lzmadec | sed '$(transform)'` && \
rm -f $$link.1 && \ rm -f $$link.1 && \
$(LN_S) $$target.1 $$link.1 $(LN_S) $$target.1 $$link.1
uninstall-hook: uninstall-hook:
cd $(DESTDIR)$(mandir)/man1 && \ cd $(DESTDIR)$(mandir)/man1 && \
link=`echo lzmadec | $(SED) '$(transform)'` && \ link=`echo lzmadec | sed '$(transform)'` && \
rm -f $$link.1 rm -f $$link.1