summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.in5
-rw-r--r--configure.ac6
-rw-r--r--quilt.changes5
3 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in
index 802127e..61eec87 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -27,6 +27,7 @@ PATCH := @PATCH@
MKTEMP := @MKTEMP@
MSGFMT := @MSGFMT@
DIFFSTAT := @DIFFSTAT@
+RPMBUILD := @RPMBUILD@
ifeq "$(MSGFMT)" ""
MAKE_NLS := @true
@@ -106,8 +107,8 @@ dist : clean $(PACKAGE)-$(VERSION).tar.gz
snapshot : $(PACKAGE)-$(ISODATE).tar.bz2
-rpm : $(PACKAGE)-$(VERSION).tar.gz
- rpm -tb $<
+rpm rpmbuild : $(PACKAGE)-$(VERSION).tar.gz
+ $(RPMBUILD) -tb $<
doc/README : doc/README.in
@echo README.in -> README
diff --git a/configure.ac b/configure.ac
index 63ecaed..f23dbec 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.24],[quilt-dev@nongnu.org])
AC_CONFIG_AUX_DIR(config)
AC_PREREQ(2.53)
-AC_REVISION ($Revision: 1.14 $)
+AC_REVISION ($Revision: 1.15 $)
PACKAGE_RELEASE=1
AC_SUBST(PACKAGE_RELEASE)
@@ -216,6 +216,10 @@ if test -z "$MSGFMT" ; then
AC_MSG_NOTICE([Building without natural language support])
fi
+dnl Check for rpmbuild (v4) vs. rpm (v3)
+AC_PATH_PROGS(RPMBUILD, [rpmbuild rpm])
+AC_SUBST(RPMBUILD)
+
AC_CONFIG_FILES(Makefile)
AC_OUTPUT
diff --git a/quilt.changes b/quilt.changes
index de3dde6..e4cb1dd 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,9 @@
-------------------------------------------------------------------
+Wed Jul 23 11:44:24 CEST 2003 - agruen@suse.de
+
+- Add Autoconf test for rpmbuild vs. rpm (needed for `make rpm').
+
+-------------------------------------------------------------------
Sun Jul 20 00:31:53 CEST 2003 - agruen@suse.de
- lib/backup-files.c: Copy files if hard linking is not possible,