dpkg: restore dpkg support
Reverse changes in commit 7d1591a that broke support for
dpkg (specifically dpkg-buildpackage couldn't run as debian/control was
not automatically generated).
This commit is contained in:
1 parent
49581ff4eb
commit
0c0ccb7c74
4 files changed
+29
No files matched your search
@@ -5,6 +5,14 @@ ACLOCAL_AMFLAGS = -I m4
|
|||||||
#SUBDIRS = datapath
|
#SUBDIRS = datapath
|
||||||
SUBDIRS =
|
SUBDIRS =
|
||||||
|
|
||||||
|
if HAVE_DPKG_BUILDPACKAGE
|
||||||
|
distcheck-hook:
|
||||||
|
cd $(srcdir) && dpkg-buildpackage -rfakeroot -us -uc
|
||||||
|
cd $(srcdir) && fakeroot ./debian/rules clean
|
||||||
|
else
|
||||||
|
distcheck-hook:
|
||||||
|
endif
|
||||||
|
|
||||||
AM_CPPFLAGS = $(SSL_CFLAGS)
|
AM_CPPFLAGS = $(SSL_CFLAGS)
|
||||||
AM_CPPFLAGS += -I $(top_srcdir)/include
|
AM_CPPFLAGS += -I $(top_srcdir)/include
|
||||||
AM_CPPFLAGS += -I $(top_srcdir)/lib
|
AM_CPPFLAGS += -I $(top_srcdir)/lib
|
||||||
@@ -56,3 +64,4 @@ include udatapath/automake.mk
|
|||||||
include tests/automake.mk
|
include tests/automake.mk
|
||||||
include include/automake.mk
|
include include/automake.mk
|
||||||
include third-party/automake.mk
|
include third-party/automake.mk
|
||||||
|
include debian/automake.mk
|
||||||
@@ -180,6 +180,13 @@ AC_DEFUN([OFP_CHECK_IF_PACKET],
|
|||||||
[Define to 1 if net/if_packet.h is available.])
|
[Define to 1 if net/if_packet.h is available.])
|
||||||
fi])
|
fi])
|
||||||
|
|
||||||
|
dnl Checks for dpkg-buildpackage. If this is available then we check
|
||||||
|
dnl that the Debian packaging is functional at "make distcheck" time.
|
||||||
|
AC_DEFUN([OFP_CHECK_DPKG_BUILDPACKAGE],
|
||||||
|
[AC_CHECK_PROG([HAVE_DPKG_BUILDPACKAGE], [dpkg-buildpackage], [yes], [no])
|
||||||
|
AM_CONDITIONAL([HAVE_DPKG_BUILDPACKAGE],
|
||||||
|
[test $HAVE_DPKG_BUILDPACKAGE = yes])])
|
||||||
|
|
||||||
dnl ----------------------------------------------------------------------
|
dnl ----------------------------------------------------------------------
|
||||||
dnl These macros are from GNU PSPP, with the following original license:
|
dnl These macros are from GNU PSPP, with the following original license:
|
||||||
dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
|
dnl Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
|
||||||
|
|||||||
@@ -1,3 +1,14 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
# Generate list of files in debian/ to distribute.
|
||||||
|
(echo '# Automatically generated by boot.sh (from Git tree).' &&
|
||||||
|
printf 'EXTRA_DIST += \\\n' &&
|
||||||
|
git ls-files debian | grep -v '^debian/\.gitignore$' |
|
||||||
|
sed -e 's/\(.*\)/ \1 \\/' -e '$s/ \\//') > debian/automake.mk
|
||||||
|
|
||||||
|
cat debian/control.in > debian/control
|
||||||
|
|
||||||
|
# Bootstrap configure system from .ac/.am files
|
||||||
autoreconf --install --force
|
autoreconf --install --force
|
||||||
@@ -62,6 +62,8 @@ AC_ARG_VAR(KARCH, [Kernel Architecture String])
|
|||||||
AC_SUBST(KARCH)
|
AC_SUBST(KARCH)
|
||||||
#OFP_CHECK_LINUX(l26, 2.6, KBLD26, KSRC26, L26_ENABLED)
|
#OFP_CHECK_LINUX(l26, 2.6, KBLD26, KSRC26, L26_ENABLED)
|
||||||
|
|
||||||
|
OFP_CHECK_DPKG_BUILDPACKAGE
|
||||||
|
|
||||||
OFP_ENABLE_OPTION([-Wall])
|
OFP_ENABLE_OPTION([-Wall])
|
||||||
OFP_ENABLE_OPTION([-Wno-sign-compare])
|
OFP_ENABLE_OPTION([-Wno-sign-compare])
|
||||||
OFP_ENABLE_OPTION([-Wpointer-arith])
|
OFP_ENABLE_OPTION([-Wpointer-arith])
|
||||||
|
|||||||
Reference in new issue
Block a user