[sword-svn] r1731 - trunk

[dglassey at crosswire.org]

Author: dglassey
Date: 2005-02-23 08:42:14 -0700 (Wed, 23 Feb 2005)
New Revision: 1731

Modified:
   trunk/Makefile.am
Log:
Don't try to install sword.conf in just plain make

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2005-02-23 15:40:16 UTC (rev 1730)
+++ trunk/Makefile.am	2005-02-23 15:42:14 UTC (rev 1731)
@@ -87,15 +87,13 @@
 if INSTCONF
 sysconf_DATA = sword.conf
 sword.conf:
-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
-	@echo "[Install]" > $(DESTDIR)$(sysconfdir)/sword.conf
-	@echo "DataPath=$(pkgdatadir)/" >> $(DESTDIR)$(sysconfdir)/sword.conf
+	@echo "[Install]" > sword.conf
+	@echo "DataPath=$(pkgdatadir)/" >> sword.conf
 
 clean-generic:
 	-rm -f sword.conf
 endif
 
-
 noinst_PROGRAMS = testlib
 testlib_SOURCES = testlib.cpp
 
@@ -148,11 +146,6 @@
 	@echo "The output of this command has been sent to CrossWire-- thank you.  Enjoy!"
 	@echo ""
 
-install_config: 
-	@echo "[Install]" > $(DESTDIR)$(sysconfdir)/sword.conf
-	@echo "DataPath=$(pkgdatadir)/" >> $(DESTDIR)$(sysconfdir)/sword.conf
-	@echo "sword.conf generated"
-
 dist-hook:
 	(cd $(distdir) && ./autogen.sh)
 	rm -r $(distdir)/autom4te.cache