From 7befadd522a473e796b930bebd950216adc8ab6e Mon Sep 17 00:00:00 2001
From: Jean Delvare <jdelvare@suse.de>
Date: Fri, 16 Dec 2011 16:00:22 +0100
Subject: configure*, Makefile.in: Use the standard docdir definition

That way, it can be easily changed from the command line, which
was not the case before.
---
 Makefile.in   | 13 +++++++------
 configure     |  6 +-----
 configure.ac  |  7 +------
 quilt.changes |  6 ++++++
 4 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 2ddea7e..06b5f78 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,7 @@
 PACKAGE :=	@PACKAGE_NAME@
 VERSION :=	@PACKAGE_VERSION@
 RELEASE :=	@PACKAGE_RELEASE@
+PACKAGE_TARNAME := @PACKAGE_TARNAME@
 PACKAGE_BUGREPORT := @PACKAGE_BUGREPORT@
 
 prefix :=	@prefix@
@@ -213,7 +214,7 @@ doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%) $(COMPAT)
 	    ;;								\
 	  *@DOCSUBDIR@*)						\
 	    echo "$$line" |						\
-	    $(SED) -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \
+	    $(SED) -e 's:@DOCSUBDIR''@:$(docdir):g' \
 	    ;;								\
 	  *)								\
 	    echo "$$line"						\
@@ -272,7 +273,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in quilt/*.in quilt/scripts/*.in)) :: Makefil
 		-e 's:@RELEASE''@:$(RELEASE):g'				\
 		-e 's:@ETCDIR''@:$(etcdir):g'				\
 		-e 's:@LOCALEDIR''@:$(localedir):g'			\
-		-e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g'	\
+		-e 's:@DOCSUBDIR''@:$(docdir):g'			\
 		$< > $@
 	@$(if $(filter-out $<,$(NON_EXEC_IN)),chmod +x $@)
 
@@ -331,11 +332,11 @@ endif
 	$(INSTALL) -d $(BUILD_ROOT)$(libdir)/$(PACKAGE)
 	$(INSTALL) -m 755 $(LIB:%=lib/%) $(BUILD_ROOT)$(libdir)/$(PACKAGE)/
 
-	$(INSTALL) -d $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
+	$(INSTALL) -d $(BUILD_ROOT)$(docdir)/
 	$(INSTALL) -m 644 doc/README					\
-		   $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
+		   $(BUILD_ROOT)$(docdir)/
 	$(INSTALL) -m 644 doc/quilt.pdf doc/README.MAIL			\
-		   $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/
+		   $(BUILD_ROOT)$(docdir)/
 
 	$(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1
 	$(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/
@@ -373,7 +374,7 @@ uninstall ::
 		   $(notdir $(MAN1)))					\
 	       $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt		\
 	       $(BUILD_ROOT)$(etcdir)/quilt.quiltrc			\
-	       $(BUILD_ROOT)$(docdir)/$(PACKAGE)-$(VERSION)/		\
+	       $(BUILD_ROOT)$(docdir)/					\
 	       $(BUILD_ROOT)$(emacsdir)/quilt.el
 
 check: $(TESTS:test/%.test=test/.%.ok)
diff --git a/configure b/configure
index e73dc92..4ab31fd 100755
--- a/configure
+++ b/configure
@@ -1902,6 +1902,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 PACKAGE_RELEASE=1
 
 
+
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -6757,11 +6758,6 @@ $as_echo "$as_me: Building without natural language support" >&6;}
 fi
 
 
-if test -n "$RPM_DOC_DIR" ; then
-    docdir="$RPM_DOC_DIR"
-else
-    docdir='$(datadir)/doc'
-fi
 
 
 
diff --git a/configure.ac b/configure.ac
index b5851eb..4088e31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_REVISION ($Revision: 1.84 $)
 
 PACKAGE_RELEASE=1
 AC_SUBST(PACKAGE_RELEASE)
+AC_SUBST(PACKAGE_TARNAME)
 
 dnl Setup for backup-files compilation
 AC_HEADER_STDC
@@ -370,12 +371,6 @@ if test $USE_NLS = no ; then
 fi
 AC_SUBST(USE_NLS)
 
-dnl Determine where package documentation is supposed to go
-if test -n "$RPM_DOC_DIR" ; then
-    docdir="$RPM_DOC_DIR"
-else
-    docdir='$(datadir)/doc'
-fi
 AC_SUBST(docdir)
 
 dnl Check for rpmbuild (v4) vs. rpm (v3)
diff --git a/quilt.changes b/quilt.changes
index 01adacf..d5f5222 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Dec 16 15:56:46 CET 2011 - jdelvare@suse.de
+
+- configure*, Makefile.in: Use the standard docdir definition, so
+  that it can be easily changed from the command line.
+
 -------------------------------------------------------------------
 Thu Dec 15 14:20:04 CET 2011 - jdelvare@suse.de
 
-- 
cgit