forked from pool/quilt
0fd0860883
already up-to-date. This avoids problems when version of autoconf is too old. OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm/quilt?expand=0&rev=42
103 lines
2.8 KiB
Diff
103 lines
2.8 KiB
Diff
---
|
|
Makefile.in | 13 +++++++------
|
|
configure.ac | 7 +------
|
|
2 files changed, 8 insertions(+), 12 deletions(-)
|
|
|
|
--- 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:%=qu
|
|
;; \
|
|
*@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 qu
|
|
-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)
|
|
--- 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)
|
|
--- a/configure
|
|
+++ b/configure
|
|
@@ -1902,6 +1902,7 @@ ac_configure="$SHELL $ac_aux_dir/configu
|
|
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 natur
|
|
fi
|
|
|
|
|
|
-if test -n "$RPM_DOC_DIR" ; then
|
|
- docdir="$RPM_DOC_DIR"
|
|
-else
|
|
- docdir='$(datadir)/doc'
|
|
-fi
|
|
|
|
|
|
|