jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add --enable-strict-locations option, describe default in its help text

Browse Source 
Rather than guess user's intention based on whether --prefix was
specified, use an explicit option to enable strict GNU Coding Standards
for installation directories.

The default is to use /etc and /var rather than corresponding directories
under prefix.

Use --enable-strict-locations in "make distcheck", it expects all
installed files to be under prefix.
This commit is contained in:
Pavel Roskin 2016-12-24 14:48:02 -08:00 committed by jsorg71
parent 1c355409a7
commit 24d44def60
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -1,5 +1,7 @@
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4
AM_DISTCHECK_CONFIGURE_FLAGS = --without-systemdsystemunitdir AM_DISTCHECK_CONFIGURE_FLAGS = \
--without-systemdsystemunitdir \
--enable-strict-locations
EXTRA_DIST = \ EXTRA_DIST = \
COPYING \ COPYING \

11
configure.ac
View File

@ -292,9 +292,14 @@ CFLAGS="$save_CFLAGS"
AC_SUBST([moduledir], '${libdir}/xrdp') AC_SUBST([moduledir], '${libdir}/xrdp')
if test "x${prefix}" = "xNONE" ; then AC_ARG_ENABLE([strict-locations],
sysconfdir="/etc"; [AS_HELP_STRING([--enable-strict-locations],
localstatedir="/var"; [Use standard Autoconf install directories unless overridden
(default: use /etc and /var)])])
if test "x$enable_strict_locations" != "xyes"; then
sysconfdir="/etc";
localstatedir="/var";
fi fi
PKG_INSTALLDIR PKG_INSTALLDIR