X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/51f81705f05a627c71dc96567a26837514ad48f0..95cd2b3a5599955317d1f80d515c0d5d5c568c7d:/src/Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index f9224c3..c2019c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,8 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 
-AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
+AM_LDFLAGS  = -L$(top_builddir)/lib
 
 lib_LTLIBRARIES = libupkg.la
 pkglib_LTLIBRARIES =
@@ -19,6 +20,6 @@ libupkg_la_SOURCES = libupkg.c pack.c
 
 bin_PROGRAMS  = upkg
 upkg_SOURCES  = upkg.c
-upkg_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib $(GLIB_CFLAGS)
-upkg_LDFLAGS  = -L$(top_builddir)/lib -export-dynamic
+upkg_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+upkg_LDFLAGS  = $(AM_LDFLAGS) -export-dynamic
 upkg_LDADD    = libuobject.la libupkg.la $(GLIB_LIBS) -lgnu