quilt: 0.45 -> 0.47

This commit is contained in:
Richard Purdie 2008-12-31 19:20:24 +00:00
parent 01e07585ad
commit 4bb83f1e22
7 changed files with 70 additions and 23 deletions

View File

@ -1,19 +0,0 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
--- quilt-0.32/Makefile.in~install
+++ quilt-0.32/Makefile.in
@@ -9,9 +9,9 @@
libdir := @libdir@
datadir := @datadir@
docdir := @docdir@
-mandir := $(datadir)/man
+mandir := @mandir@
localedir := $(datadir)/locale
-etcdir := $(subst /usr/etc,/etc,$(prefix)/etc)
+etcdir := @sysconfdir@
QUILT_DIR = $(datadir)/$(PACKAGE)
SCRIPTS_DIR = $(QUILT_DIR)/scripts

View File

@ -1,10 +1,10 @@
Add the aclocal.m4 as acinclude.m4
Index: quilt-0.45/acinclude.m4
Index: quilt-0.47/acinclude.m4
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ quilt-0.45/acinclude.m4 2006-08-06 23:18:56.000000000 +0200
@@ -0,0 +1,64 @@
+++ quilt-0.47/acinclude.m4 2006-10-10 17:05:56.000000000 +0100
@@ -0,0 +1,119 @@
+dnl Allow configure to specify a specific binary
+dnl 1: Environment variable
+dnl 2: binary name
@ -69,3 +69,58 @@ Index: quilt-0.45/acinclude.m4
+ fi
+ AC_SUBST($1)
+])
+
+dnl Allow configure to specify a specific binary
+dnl This variant is for optional binaries.
+dnl 1: Environment variable
+dnl 2: binary name
+dnl 3: optional list of alternative binary names
+dnl 4: optional list of additional search directories
+AC_DEFUN([QUILT_COMPAT_PROG_PATH_OPT],[
+ AC_ARG_WITH($2, AC_HELP_STRING(
+ [--with-$2], [name of the $2 executable to use]),
+ [
+ if test x"$withval" != xno; then
+ AC_MSG_CHECKING(for $2)
+ $1="$withval"
+ if test -e "$$1"; then
+ if test ! -f "$$1" -a ! -h "$$1" || test ! -x "$$1"; then
+ AC_MSG_ERROR([$$1 is not an executable file])
+ fi
+ fi
+ AC_MSG_RESULT([$$1])
+ if test ! -e "$$1"; then
+ AC_MSG_WARN([$$1 does not exist])
+ fi
+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
+ fi
+ ],[
+ m4_if([$3],[],[
+ AC_PATH_PROG($1,$2,,$PATH:$4)
+ ],[
+ AC_PATH_PROGS($1,$3,,$PATH:$4)
+ if test -n "$$1" -a "`expr "$$1" : '.*/\([[^/]]*\)$'`" != "$2"; then
+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
+ fi
+ ])
+ m4_if([$4],[],[],[
+ if test -n "$$1"; then
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ for dir in "$4"; do
+ if test "`dirname $$1`" = "$dir"; then
+ COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
+ break
+ fi
+ done
+ IFS="$as_save_IFS"
+ fi
+ ])
+ if test -z "$$1"; then
+ AC_MSG_WARN([$2 not found, some optional functionalities will be missing])
+ fi
+ ])
+ if test -z "$$1"; then
+ $1=$2
+ fi
+ AC_SUBST($1)
+])

View File

@ -0,0 +1,11 @@
--- quilt-0.47/Makefile.in 2008-12-31 19:09:13.000000000 +0000
+++ quilt-0.47/Makefile.in.orig 2008-08-21 13:21:32.000000000 +0100
@@ -13,7 +13,7 @@
mandir := @mandir@
localedir := $(datadir)/locale
emacsdir := $(datadir)/emacs/site-lisp
-etcdir := $(subst /usr/etc,/etc,$(prefix)/etc)
+etcdir := @sysconfdir@
INSTALL := @INSTALL@
POD2MAN := @POD2MAN@

View File

@ -1,3 +1,3 @@
PV = "0.45"
PV = "0.47"
PR = "r2"
require quilt-native.inc