diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rwxr-xr-x | debian/autogen.sh | 3 |
4 files changed, 6 insertions, 1 deletions
@@ -1,4 +1,5 @@ *~ +/m4 .*.swp *.[oa] *.l[oa] diff --git a/Makefile.am b/Makefile.am index 1422d22..c4a71ec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 + opdir = $(datadir)/vyatta-op/templates bin_sudo_usersdir = $(bindir)/sudo-users diff --git a/configure.ac b/configure.ac index 7901d66..2d5ef35 100644 --- a/configure.ac +++ b/configure.ac @@ -11,6 +11,7 @@ AC_INIT([vyatta-op-vpn], VERSION_ID, [maintainers@vyos.net]) test -n "$VYATTA_VERSION" || VYATTA_VERSION=$PACKAGE_VERSION +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([config]) AM_INIT_AUTOMAKE([gnu no-dist-gzip dist-bzip2 subdir-objects]) AC_PREFIX_DEFAULT([/opt/vyatta]) diff --git a/debian/autogen.sh b/debian/autogen.sh index e8c94af..92719c8 100755 --- a/debian/autogen.sh +++ b/debian/autogen.sh @@ -1,9 +1,10 @@ #!/bin/sh -rm -rf config +rm -rf config m4 rm -f aclocal.m4 config.guess config.statusconfig.sub configure INSTALL +mkdir -p m4 autoreconf --force --install rm -f config.sub config.guess |