From bb0dd6974edc81c52faab471b2c685245b7fdb68 Mon Sep 17 00:00:00 2001
From: Micah Anderson <micah@riseup.net>
Date: Fri, 20 Jan 2006 01:46:14 +0000
Subject: Fixed up Makefiles to actually work

---
 lib/Makefile.am | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'lib/Makefile.am')

diff --git a/lib/Makefile.am b/lib/Makefile.am
index e56f0b2..f8064a1 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,26 +1,29 @@
-EXTRA_DIST = easydialog.in parseini.in tools.in vserver.in
-
-GENERATED_FILES = easydialog parseini tools vserver
+lib_SCRIPTS = easydialog parseini tools vserver
 
-dist_pkglib_DATA = $(GENERATED_FILES)
+CLEANFILES = $(lib_SCRIPTS)
 
-CLEANFILES = $(GENERATED_FILES)
+EXTRA_DIST = easydialog.in parseini.in tools.in vserver.in
 
 edit = sed \
-    -e "s,@BASH\@,$(BASH),g"
-
-easydialog:
+    -e "s,@CFGDIR\@,$(CFGDIR),g" \
+    -e "s,@BASH\@,$(BASH),g" \
+    -e 's,@datadir\@,$(pkgdatadir),g' \
+    -e "s,@libdir\@,$(pkglibdir),g" \
+    -e 's,@localstatedir\@,$(localstatedir),g' \
+        -e 's,@prefix\@,$(prefix),g'
+
+easydialog: $(srcdir)/easydialog.in
 	rm -f easydialog
 	$(edit) easydialog.in > easydialog
 
-parseini:
+parseini: $(srcdir)/parseini.in
 	rm -f parseini
 	$(edit) parseini.in > parseini
 
-tools:
+tools: $(srcdir)/tools.in
 	rm -f tools
 	$(edit) tools.in > tools
 
-vserver:
+vserver: $(srcdir)/vserver.in
 	rm -f vserver
 	$(edit) vserver.in > vserver
-- 
cgit v1.2.3