dcbaker
/
pkgconf
forked from ariadne/pkgconf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

buildsystem: go back to using the makefile to expand the defaults (closes #89)

feature/tap-sh
William Pitcock 2016-05-19 21:12:24 -05:00
parent a7893e7572
commit 2516f7c185
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -6,7 +6,7 @@ system_includedir = @SYSTEM_INCLUDEDIR@
system_libdir = @SYSTEM_LIBDIR@ system_libdir = @SYSTEM_LIBDIR@
pkgconfigdir = @PKGCONFIGDIR@ 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 bin_PROGRAMS = pkgconf
lib_LTLIBRARIES = libpkgconf.la lib_LTLIBRARIES = libpkgconf.la

5
configure.ac
View File

@ -17,6 +17,7 @@ AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_HEADERS([libpkgconf/config.h]) AC_CONFIG_HEADERS([libpkgconf/config.h])
AC_CHECK_FUNCS([strlcpy strlcat strndup strtok_r]) AC_CHECK_FUNCS([strlcpy strlcat strndup strtok_r])
AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects]) AM_INIT_AUTOMAKE([foreign dist-xz subdir-objects])
AM_SILENT_RULES([yes])
LT_INIT LT_INIT
AC_SYS_LARGEFILE AC_SYS_LARGEFILE
@ -56,10 +57,6 @@ AC_ARG_WITH([system-includedir],[AC_HELP_STRING([--with-system-includedir],[spec
AC_SUBST([SYSTEM_INCLUDEDIR]) 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_CPP
AC_PROG_CC AC_PROG_CC
AC_PROG_INSTALL AC_PROG_INSTALL