diff options
| -rw-r--r-- | Makefile.in | 13 | ||||
| -rw-r--r-- | bin/quilt.in | 4 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | scripts/patchfns.in | 4 |
5 files changed, 5 insertions, 35 deletions
diff --git a/Makefile.in b/Makefile.in index 370dd68..b0cb4aa 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,7 +36,6 @@ RPMBUILD := @RPMBUILD@ MTA := @MTA@ COMPAT_SYMLINKS := @COMPAT_SYMLINKS@ -COMPAT_FUNCTIONS := @COMPAT_FUNCTIONS@ COMPAT_PROGRAMS := @COMPAT_PROGRAMS@ default: all @@ -136,13 +135,6 @@ all : scripts $(LIB:%=lib/%) : $(LIB_SRC:%.c=lib/%.o) $(CC) -o $@ $(LDFLAGS) $^ $(LIBS) -.PHONY :: compat -compat : - @rm -f compat/compatfns -ifneq ($(COMPAT_FUNCTIONS),) - cat $(COMPAT_FUNCTIONS:%=compat/%.sh) > compat/compatfns -endif - scripts : $(BIN:%=bin/%) $(QUILT:%=quilt/%) $(SCRIPTS:%=scripts/%) compat \ $(LIB:%=lib/%) $(DOC:%=doc/%) $(MAN1) @@ -298,14 +290,11 @@ install-main: scripts install-compat: @rm -rf $(BUILD_ROOT)$(COMPAT_DIR) -ifneq ($(COMPAT_PROGRAMS)$(COMPAT_FUNCTIONS)$(COMPAT_SYMLINKS),) +ifneq ($(COMPAT_PROGRAMS)$(COMPAT_SYMLINKS),) $(INSTALL) -d $(BUILD_ROOT)$(COMPAT_DIR) ifneq ($(COMPAT_PROGRAMS),) $(INSTALL) -m 755 $(COMPAT_PROGRAMS:%=compat/%) $(BUILD_ROOT)$(COMPAT_DIR) endif -ifneq ($(COMPAT_FUNCTIONS),) - $(INSTALL) -m 644 compat/compatfns $(BUILD_ROOT)$(COMPAT_DIR) -endif endif install: scripts install-main install-compat $(COMPAT_SYMLINKS:%=install-compat-symlink-%) diff --git a/bin/quilt.in b/bin/quilt.in index f37a7a0..55d0f32 100644 --- a/bin/quilt.in +++ b/bin/quilt.in @@ -21,10 +21,6 @@ fi if [ -d @QUILT@/compat ] then export PATH="@QUILT@/compat:$PATH" - if [ -r @QUILT@/compat/compatfns ] - then - source @QUILT@/compat/compatfns - fi fi usage() diff --git a/configure.ac b/configure.ac index 3e2c40b..6b7361f 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([quilt],[0.42],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) -AC_REVISION ($Revision: 1.43 $) +AC_REVISION ($Revision: 1.44 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) @@ -53,14 +53,10 @@ version of bash from ftp.gnu.org ]) fi -dnl Check for Perl QUILT_COMPAT_PROG_PATH(PERL, perl, [perl perl5]) QUILT_COMPAT_PROG_PATH(GREP, grep) -dnl Check for sed QUILT_COMPAT_PROG_PATH(SED, sed) -dnl Check for awk QUILT_COMPAT_PROG_PATH(AWK, awk, [gawk awk]) - QUILT_COMPAT_PROG_PATH(POD2MAN, pod2man) QUILT_COMPAT_PROG_PATH(COLUMN, column) QUILT_COMPAT_PROG_PATH(GETOPT, getopt) @@ -85,9 +81,7 @@ internal getopt. fi fi -dnl Checks for mktemp (for creating temporary files and directories) QUILT_COMPAT_PROG_PATH(MKTEMP, mktemp) - if test -n "$MKTEMP" ; then AC_MSG_CHECKING(whether $MKTEMP -d works) if tempdir=`$MKTEMP -d /tmp/$PACKAGE_NAME.XXXXXX 2>/dev/null` && \ @@ -104,9 +98,7 @@ internal tempfile generation mechanism. fi fi -dnl Check for diff QUILT_COMPAT_PROG_PATH(DIFF, diff) -dnl Check for patch QUILT_COMPAT_PROG_PATH(PATCH, patch) # Sun's patch is a mess, issue a warning. But we are going to continue with @@ -134,7 +126,6 @@ else AC_MSG_RESULT(yes) fi -dnl Check for diffstat AC_ARG_WITH(diffstat, AC_HELP_STRING( [--with-diffstat], [name of the diffstat executable to use]), [ @@ -200,7 +191,6 @@ that is not in the search path you can specify its location using the MTA="sendmail" fi -dnl Check for NLS AC_ARG_ENABLE(nls, AC_HELP_STRING( [--enable-nls], [include natural language support])) if test "$enableval" != "no"; then @@ -231,7 +221,6 @@ AC_SUBST(RPMBUILD) AC_SUBST(COMPAT_SYMLINKS) AC_SUBST(COMPAT_PROGRAMS) -AC_SUBST(COMPAT_FUNCTIONS) AC_CONFIG_FILES(Makefile) AC_OUTPUT diff --git a/quilt.changes b/quilt.changes index 7c45774..94c3943 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,15 +1,15 @@ ------------------------------------------------------------------- -Sun Sep 18 02:04:19 CEST 2005 - agruen@suse.de +Sun Sep 18 02:49:43 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. - 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. - Replace @FOO@ macros in scripts with foo command where possible. +- Remove compatibility shell functions and convert them to + standalone scripts. ------------------------------------------------------------------- Fri Sep 16 20:57:32 CEST 2005 - khali@linux-fr.org diff --git a/scripts/patchfns.in b/scripts/patchfns.in index d378037..965c4a4 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -27,10 +27,6 @@ DB_VERSION=2 if [ -d @QUILT@/compat ] then export PATH="@QUILT@/compat:$PATH" - if [ -r @QUILT@/compat/compatfns ] - then - source @QUILT@/compat/compatfns - fi fi unset CDPATH |