summaryrefslogtreecommitdiff
path: root/python
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2007-08-05 11:30:55 +0300
committerPanu Matilainen <pmatilai@redhat.com>2007-08-05 11:30:55 +0300
commit8d2b416782e35fc439401f35166091fe0f9de038 (patch)
treed5bcfc4878040d9e90fd62b8a0dd651ea9e7cef8 /python
parent6c4b0fc9e44ea3b9449e171404c1b2037d15d01e (diff)
downloadrpm-8d2b416782e35fc439401f35166091fe0f9de038.tar.gz
rpm-8d2b416782e35fc439401f35166091fe0f9de038.tar.bz2
rpm-8d2b416782e35fc439401f35166091fe0f9de038.zip
Automake cleanups.
- Replace INCLUDES with AM_CPPFLAGS (INCLUDES has been replaced by AM_CPPFLAGS and is deprecated in modern automakes for several years) - Require autoconf-2.61 and automake-1.10 (already required by autogen.sh) - update mkinstalldirs with the version from automake-1.10 (The version in rpm is ancient and known to be bugged) Patch from Ralf Corsepius
Diffstat (limited to 'python')
-rw-r--r--python/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/python/Makefile.am b/python/Makefile.am
index 964b27c0d..a143b2b82 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -1,7 +1,5 @@
# Makefile for rpm library.
-AUTOMAKE_OPTIONS = 1.4 foreign
-
LINT = splint
pylibdir = @WITH_PYTHON_LIB@
@@ -11,7 +9,7 @@ SUBDIRS =
EXTRA_DIST = system.h rpmdebug-py.c rpm/__init__.py
-INCLUDES = -I. \
+AM_CPPFLAGS = -I. \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/rpmdb \
@@ -62,4 +60,4 @@ splint_srcs = \
.PHONY: lint
lint:
- $(LINT) $(DEFS) $(INCLUDES) $(splint_srcs)
+ $(LINT) $(DEFS) $(AM_CPPFLAGS) $(splint_srcs)