From 2516f7c185c388979eeaf984453f9d98474d99d0 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Thu, 19 May 2016 21:12:24 -0500 Subject: [PATCH] buildsystem: go back to using the makefile to expand the defaults (closes #89) --- Makefile.am | 2 +- configure.ac | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index c7c89ea..26dc4b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -6,7 +6,7 @@ system_includedir = @SYSTEM_INCLUDEDIR@ system_libdir = @SYSTEM_LIBDIR@ pkgconfigdir = @PKGCONFIGDIR@ -AM_CFLAGS = -Wall -Wextra -Wformat=2 -std=gnu99 +AM_CFLAGS = -Wall -Wextra -Wformat=2 -std=gnu99 -DPKG_DEFAULT_PATH=\"$(pkgconfigdir)\" -DSYSTEM_INCLUDEDIR=\"$(system_includedir)\" -DSYSTEM_LIBDIR=\"$(system_libdir)\" bin_PROGRAMS = pkgconf lib_LTLIBRARIES = libpkgconf.la diff --git a/configure.ac b/configure.ac index c7788f5..64aa7d0 100644 --- a/configure.ac +++ b/configure.ac @@ -17,6 +17,7 @@ AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_HEADERS([libpkgconf/config.h]) AC_CHECK_FUNCS([strlcpy strlcat strndup strtok_r]) AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects]) +AM_SILENT_RULES([yes]) LT_INIT AC_SYS_LARGEFILE @@ -56,10 +57,6 @@ AC_ARG_WITH([system-includedir],[AC_HELP_STRING([--with-system-includedir],[spec AC_SUBST([SYSTEM_INCLUDEDIR]) -AC_DEFINE_UNQUOTED([SYSTEM_LIBDIR], "$SYSTEM_LIBDIR", [System library directory list]) -AC_DEFINE_UNQUOTED([SYSTEM_INCLUDEDIR], "$SYSTEM_INCLUDEDIR", [System include directory list]) -AC_DEFINE_UNQUOTED([PKG_DEFAULT_PATH], "$PKGCONFIGDIR", [Default PKG_CONFIG_PATH search list]) - AC_PROG_CPP AC_PROG_CC AC_PROG_INSTALL