diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2005-09-17 23:57:48 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2005-09-17 23:57:48 +0000 |
| commit | 8e965d1593d220b945d0dca601d4cfd848f79c83 (patch) | |
| tree | 8287d7b4842c830d526655f1896e7bd9c260ce99 | |
| parent | 2d3a503aa8651215e7bb939b995c33356bbce913 (diff) | |
| download | quilt-8e965d1593d220b945d0dca601d4cfd848f79c83.tar.gz | |
- Only add compat/ directory to PATH if it exists. Only create it
when necessary.
| -rw-r--r-- | Makefile.in | 8 | ||||
| -rw-r--r-- | bin/quilt.in | 11 | ||||
| -rw-r--r-- | quilt.changes | 4 | ||||
| -rw-r--r-- | scripts/patchfns.in | 9 |
4 files changed, 16 insertions, 16 deletions
diff --git a/Makefile.in b/Makefile.in index 7e1d136..63bfdef 100644 --- a/Makefile.in +++ b/Makefile.in @@ -50,12 +50,6 @@ $(foreach symlink, $(COMPAT_SYMLINKS), $(eval $(call COMPAT_SYMLINK_install, $(s install-compat-symlinks: $(COMPAT_SYMLINKS:%=install-compat-symlink-%) -define COMPAT_SYMLINK_redefine -$(shell echo $(1) | $(AWK) '{print toupper($$0)}') := $(1) -endef - -$(foreach symlink, $(COMPAT_SYMLINKS), $(eval $(call COMPAT_SYMLINK_redefine, $(symlink)))) - ifeq "$(MSGFMT)" "" MAKE_NLS := @true else @@ -299,9 +293,9 @@ install-main: scripts @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) - @rm -f $(BUILD_ROOT)$(COMPAT_DIR)/* ifneq ($(COMPAT_PROGRAMS),) @INSTALL@ -m 755 $(COMPAT_PROGRAMS:%=compat/%) $(BUILD_ROOT)$(COMPAT_DIR) endif diff --git a/bin/quilt.in b/bin/quilt.in index 600270b..96ea404 100644 --- a/bin/quilt.in +++ b/bin/quilt.in @@ -18,14 +18,15 @@ then fi # Support compatibility layer -if [ -r @QUILT@/compat/compatfns ] +if [ -d @QUILT@/compat ] then - source @QUILT@/compat/compatfns + export PATH="@QUILT@/compat:$PATH" + if [ -r @QUILT@/compat/compatfns ] + then + source @QUILT@/compat/compatfns + fi fi - -export PATH="@QUILT@/compat:$PATH" - usage() { diff --git a/quilt.changes b/quilt.changes index 32be7d2..c709d3e 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,7 +1,9 @@ ------------------------------------------------------------------- -Sun Sep 18 01:56:03 CEST 2005 - agruen@suse.de +Sun Sep 18 01:57:36 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 + when necessary. ------------------------------------------------------------------- Fri Sep 16 20:57:32 CEST 2005 - khali@linux-fr.org diff --git a/scripts/patchfns.in b/scripts/patchfns.in index 2e0b9b0..308548a 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -24,12 +24,15 @@ DB_VERSION=2 : ${QUILT_PC:=.pc} # Support compatibility layer -if [ -r @QUILT@/compat/compatfns ] +if [ -d @QUILT@/compat ] then - source @QUILT@/compat/compatfns + export PATH="@QUILT@/compat:$PATH" + if [ -r @QUILT@/compat/compatfns ] + then + source @QUILT@/compat/compatfns + fi fi -export PATH="@QUILT@/compat:$PATH" unset CDPATH shopt -s dotglob |