fixed Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 9327ff06c9c59e615dee4929e7cb646aa86a3d40..1cf6ac18ff09cd029a4c843bc4461d6a2b47efb3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@ version.c: checkversion
 checkversion:
        cd src && chmod +x version.sh && ./version.sh && cd ..
 
-bin_PROGRAMS = neonserv
+noinst_PROGRAMS = neonserv
 neonserv_SOURCES = src/version.c \
       src/EventLogger.c \
       src/IRCEvents.c \
@@ -106,7 +106,7 @@ install-exec-local:
        $(INSTALL) -m 744 ./neonserv $(prefix)
        $(INSTALL) -m 644 $(srcdir)/database.sql $(prefix)
        $(INSTALL) -m 644 $(srcdir)/database.upgrade.sql $(prefix)
-       $(INSTALL) -m 644 $(srcdir)/defaults.sql $(prefix)
+       $(INSTALL) -m 644 $(srcdir)/database.defaults.sql $(prefix)
        $(INSTALL) -m 600 $(srcdir)/neonserv.example.ini $(prefix)
        @echo
        @echo NeonServ-$(VERSION) has been installed to $(prefix)

diff --git a/configure.ac b/configure.ac
index a464dace120aaf0900557383a4d2bd3364a2ce0f..e04dfba2adbd6fbcb0ac5e1d713409ecaa7e68e7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,6 +2,7 @@
 
 AC_PREREQ([2.67])
 AC_INIT([NeonServ], [5.0], [bugs@pk910.de], [neonserv], [http://neonserv.krypton-bouncer.de])
+AC_PREFIX_DEFAULT([~/neonserv])
 AM_INIT_AUTOMAKE([foreign subdir-objects])
 AC_CONFIG_HEADERS([config.h])