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
This commit is contained in:
16
configure.ac
16
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
|
||||
|
Reference in New Issue
Block a user