diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2005-09-18 00:02:54 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2005-09-18 00:02:54 +0000 |
| commit | 9da8868de2d0f89fe81123425d60eb1fa39d2b99 (patch) | |
| tree | a329cb3765ba1ed72520c6627c42f808587bc5f0 | |
| parent | d21b84b4753417a03a18a101ba187e059b048515 (diff) | |
| download | quilt-9da8868de2d0f89fe81123425d60eb1fa39d2b99.tar.gz | |
- Replace @INSTALL@ with $(INSTALL) and @BASH@ with $(BASH) in
Makefile.in.
| -rw-r--r-- | Makefile.in | 48 | ||||
| -rw-r--r-- | quilt.changes | 4 |
2 files changed, 27 insertions, 25 deletions
diff --git a/Makefile.in b/Makefile.in index 4e286b3..370dd68 100644 --- a/Makefile.in +++ b/Makefile.in @@ -173,13 +173,13 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) case "$$line" in \ '@REFERENCE''@') \ for cmd in $(sort $(QUILT:%=quilt/%)) ; do \ - (@BASH@ -c ". scripts/patchfns ; LC_ALL=C . $$here/$$cmd -h")| \ + ($(BASH) -c ". scripts/patchfns ; LC_ALL=C . $$here/$$cmd -h")| \ sed -e 's/Usage: quilt //' \ -e 's/^\([^ ]*\)/\\fB\1\\fP/' \ -e 's/^/.IP "/' -e 's/$$/ " 4/' | \ head -n 1; \ echo ; \ - (@BASH@ -c ". scripts/patchfns ; LC_ALL=C . $$here/$$cmd -h")| \ + ($(BASH) -c ". scripts/patchfns ; LC_ALL=C . $$here/$$cmd -h")| \ grep -v 'Usage: quilt' | \ sed -e $$'s/^\t//' \ -e $$'s/\t/\\\n/' | \ @@ -200,7 +200,7 @@ reference : $(QUILT:%=quilt/%) scripts/patchfns for i in $(filter-out scripts/patchfns,$+); \ do \ echo; \ - (@BASH@ -c ". scripts/patchfns ; cd $$dir ;LC_ALL=C . $$i -h"); \ + ($(BASH) -c ". scripts/patchfns ; cd $$dir ;LC_ALL=C . $$i -h"); \ echo; \ done | \ sed -e 's/\$$EDITOR ([^)]*)/$$EDITOR/' \ @@ -264,47 +264,47 @@ Makefile : Makefile.in @false install-main: scripts - @INSTALL@ -d $(BUILD_ROOT)$(bindir) - @INSTALL@ -m 755 $(BIN:%=bin/%) $(BUILD_ROOT)$(bindir)/ + $(INSTALL) -d $(BUILD_ROOT)$(bindir) + $(INSTALL) -m 755 $(BIN:%=bin/%) $(BUILD_ROOT)$(bindir)/ - @INSTALL@ -d $(BUILD_ROOT)$(QUILT_DIR) - @INSTALL@ -m 755 $(QUILT:%=quilt/%) $(BUILD_ROOT)$(QUILT_DIR)/ + $(INSTALL) -d $(BUILD_ROOT)$(QUILT_DIR) + $(INSTALL) -m 755 $(QUILT:%=quilt/%) $(BUILD_ROOT)$(QUILT_DIR)/ - @INSTALL@ -d $(BUILD_ROOT)$(SCRIPTS_DIR) - @INSTALL@ -m 755 $(patsubst %,scripts/%, \ + $(INSTALL) -d $(BUILD_ROOT)$(SCRIPTS_DIR) + $(INSTALL) -m 755 $(patsubst %,scripts/%, \ $(filter-out patchfns,$(SCRIPTS))) \ $(BUILD_ROOT)$(SCRIPTS_DIR) - @INSTALL@ -m 644 scripts/patchfns $(BUILD_ROOT)$(SCRIPTS_DIR) + $(INSTALL) -m 644 scripts/patchfns $(BUILD_ROOT)$(SCRIPTS_DIR) - @INSTALL@ -d $(BUILD_ROOT)$(LIB_DIR) - @INSTALL@ -m 755 -s $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/ + $(INSTALL) -d $(BUILD_ROOT)$(LIB_DIR) + $(INSTALL) -m 755 -s $(LIB:%=lib/%) $(BUILD_ROOT)$(LIB_DIR)/ - @INSTALL@ -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ - @INSTALL@ -m 644 doc/README \ + $(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ + $(INSTALL) -m 644 doc/README \ $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ - @INSTALL@ -m 644 doc/quilt.pdf doc/README.MAIL \ + $(INSTALL) -m 644 doc/quilt.pdf doc/README.MAIL \ $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/ - @INSTALL@ -d $(BUILD_ROOT)$(mandir)/man1 - @INSTALL@ -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/ + $(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1 + $(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/ $(MAKE_NLS) -C po install BUILD_ROOT=$(BUILD_ROOT) \ LINGUAS="$(LINGUAS)" localedir=$(localedir) - @INSTALL@ -d $(BUILD_ROOT)$(etcdir) - @INSTALL@ -d $(BUILD_ROOT)$(etcdir)/bash_completion.d - @INSTALL@ -m 644 bash_completion $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt - @INSTALL@ -m 644 quilt.quiltrc $(BUILD_ROOT)$(etcdir)/ + $(INSTALL) -d $(BUILD_ROOT)$(etcdir) + $(INSTALL) -d $(BUILD_ROOT)$(etcdir)/bash_completion.d + $(INSTALL) -m 644 bash_completion $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt + $(INSTALL) -m 644 quilt.quiltrc $(BUILD_ROOT)$(etcdir)/ install-compat: @rm -rf $(BUILD_ROOT)$(COMPAT_DIR) ifneq ($(COMPAT_PROGRAMS)$(COMPAT_FUNCTIONS)$(COMPAT_SYMLINKS),) - @INSTALL@ -d $(BUILD_ROOT)$(COMPAT_DIR) + $(INSTALL) -d $(BUILD_ROOT)$(COMPAT_DIR) ifneq ($(COMPAT_PROGRAMS),) - @INSTALL@ -m 755 $(COMPAT_PROGRAMS:%=compat/%) $(BUILD_ROOT)$(COMPAT_DIR) + $(INSTALL) -m 755 $(COMPAT_PROGRAMS:%=compat/%) $(BUILD_ROOT)$(COMPAT_DIR) endif ifneq ($(COMPAT_FUNCTIONS),) - @INSTALL@ -m 644 compat/compatfns $(BUILD_ROOT)$(COMPAT_DIR) + $(INSTALL) -m 644 compat/compatfns $(BUILD_ROOT)$(COMPAT_DIR) endif endif diff --git a/quilt.changes b/quilt.changes index 22afdaf..e30dfb8 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Sun Sep 18 02:00:50 CEST 2005 - agruen@suse.de +Sun Sep 18 02:03:10 CEST 2005 - agruen@suse.de - Merge compatibility layer from John Vandenberg <jayvdb@gmail.com>. - Only add compat/ directory to PATH if it exists. Only create it @@ -7,6 +7,8 @@ Sun Sep 18 02:00:50 CEST 2005 - agruen@suse.de - configure.ac: fail if getopt does not support --long. - Remove compat/compatfns when no compatibility functions are included. Clean up some Makefile dependencies. +- Replace @INSTALL@ with $(INSTALL) and @BASH@ with $(BASH) in + Makefile.in. ------------------------------------------------------------------- Fri Sep 16 20:57:32 CEST 2005 - khali@linux-fr.org |