diff options
| author | Craig Small <csmall@enc.com.au> | 2015-05-10 15:28:56 +1000 |
|---|---|---|
| committer | Craig Small <csmall@enc.com.au> | 2015-05-10 15:28:56 +1000 |
| commit | 1daaac2180274a445ab874cc2992067fcd32043e (patch) | |
| tree | b890d0122c30e509e18e81487a7f909aae9c93bb /configure.ac | |
| parent | e40b0060c2ccee78833ebe2b5810dd3ec3f61b46 (diff) | |
| parent | 430b559ba2826f80dffa840622ae0fc744000b13 (diff) | |
| download | procps-ng-1daaac2180274a445ab874cc2992067fcd32043e.tar.gz | |
Merge branch 'filbranden/procps-build_sys_cleanup_usrbin'
configure.ac conflict was due to the git url being
changed after the merge request.
Conflicts:
configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index fd7d4ca..612097f 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AC_CONFIG_MACRO_DIR([m4]) AC_INIT([procps-ng], m4_esyscmd([misc/git-version-gen .tarball-version]), [procps@freelists.org],,[https://gitlab.com/procps-ng/procps]) -AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability tar-pax no-dist-gzip dist-xz]) +AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects -Wall -Wno-portability tar-pax no-dist-gzip dist-xz]) AM_SILENT_RULES([yes]) AC_CONFIG_SRCDIR([free.c]) AC_CONFIG_HEADERS([config.h]) @@ -41,7 +41,6 @@ AC_PROG_INSTALL AC_PROG_LN_S PKG_PROG_PKG_CONFIG AC_PROG_MAKE_SET -AC_PROG_RANLIB # Checks for header files. AC_HEADER_MAJOR @@ -70,9 +69,6 @@ AC_FUNC_MMAP AC_FUNC_REALLOC AC_FUNC_STRTOD -usrbin_execdir='${exec_prefix}/usr/bin' -AC_SUBST([usrbin_execdir]) - AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT([external]) if test -d "$srcdir/po" @@ -275,12 +271,8 @@ AC_CHECK_FUNCS([__fpending alarm atexit dup2 getpagesize gettimeofday iswprint m AC_CONFIG_FILES([Makefile include/Makefile - lib/Makefile - man-po/Makefile - po/Makefile.in - proc/Makefile + man-po/Makefile + po/Makefile.in proc/libprocps.pc - ps/Makefile - testsuite/Makefile - top/Makefile]) + testsuite/Makefile]) AC_OUTPUT |