summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.am1
-rw-r--r--libgtopConf.sh.in2
3 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b2881196..4cb54056 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-01-23 Martin Baulig <martin@home-of-linux.org>
+
+ * libgtopConf.sh.in (LIBGTOP_DATADIR): New variable.
+
1999-01-06 Martin Baulig <martin@home-of-linux.org>
* libgtop-sysdeps.m4: Always enable SMP support for Linux.
diff --git a/Makefile.am b/Makefile.am
index e5cae99a..1f367511 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -47,6 +47,7 @@ libgtopConf.sh: libgtopConf.sh.in Makefile
## Use sed and then mv to avoid problems if the user interrupts.
sed -e 's#\@LIBGTOP_LIBDIR\@#$(libdir)#g' \
-e 's#\@LIBGTOP_INCLUDEDIR\@#$(includedir)#g' \
+ -e 's#\@LIBGTOP_DATADIR\@#$(datadir)#g' \
-e 's#\@LIBGTOP_EXTRA_LIBS\@#$(LIBGTOP_EXTRA_LIBS)#g' \
-e 's#\@LIBGTOP_LIBS\@#$(LIBGTOP_LIBS)#g' \
-e 's#\@LIBGTOP_INCS\@#$(LIBGTOP_INCS)#g' \
diff --git a/libgtopConf.sh.in b/libgtopConf.sh.in
index af01ed25..c8a013d0 100644
--- a/libgtopConf.sh.in
+++ b/libgtopConf.sh.in
@@ -5,6 +5,8 @@
LIBGTOP_LIBDIR="@LIBGTOP_LIBDIR@"
LIBGTOP_INCLUDEDIR="@LIBGTOP_INCLUDEDIR@"
+LIBGTOP_DATADIR="@LIBGTOP_DATADIR@"
+
LIBGTOP_EXTRA_LIBS="@LIBGTOP_EXTRA_LIBS@"
LIBGTOP_LIBS="@LIBGTOP_LIBS@"