Add an install target in the Makefile (can't believe we didn't already

have one).

diff --git a/Makefile.in b/Makefile.in
index a6c12c5c3bd2e4318e009110438eb031e7e9b31a..39007d5831f0a8db2f65bdd45c69a813c31dbee9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,6 +48,21 @@ OBJS = stats.o cleankey.o $(CORE_OBJS) $(KEYDB_OBJ)
 all: .depend $(PROGS) testparse maxpath sixdegrees splitkeys onak.conf \
        $(BACKENDS)
 
+install: $(PROGS) onak.conf $(BACKENDS)
+       install -d $(DESTDIR)/@bindir@
+       install -d $(DESTDIR)/@libdir@/onak/backends
+       install -d $(DESTDIR)/@localstatedir@/lib/onak
+       install -d $(DESTDIR)/@mandir@/man1
+       install -d $(DESTDIR)/@sysconfdir@
+       install onak-mail.pl $(DESTDIR)/@libdir@/onak
+       install onak splitkeys $(DESTDIR)/@bindir@
+       install onak.1 splitkeys.1 $(DESTDIR)/@mandir@/man1
+ifeq (x@DBTYPE@, xdynamic)
+       install $(BACKENDS) $(DESTDIR)/@libdir@/onak/backends
+       install -d $(DESTDIR)/@sbindir@
+       install keyd $(DESTDIR)/@sbindir@
+endif
+
 keyd: keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o
        $(CC) $(LDFLAGS) $(PROGS_LDFLAGS_EXTRA) \
                -o keyd keyd.o $(CORE_OBJS) keydb_$(DBTYPE).o $(LIBS)

diff --git a/debian/onak.install b/debian/onak.install
index 8ea4f3c395706ee9a0e30e49fcefa7fda90e96ec..81788bf3aab382c79a9d7f4bbad7093f8f05637a 100644 (file)
--- a/debian/onak.install
+++ b/debian/onak.install
@@ -1,6 +1,2 @@
 onak.conf             etc
-onak splitkeys        usr/bin
-onak-mail.pl          usr/lib/onak
-libkeydb_*.so         usr/lib/onak/backends
 add lookup gpgwww     usr/lib/cgi-bin/pks
-onak.1 splitkeys.1    usr/share/man/man1

diff --git a/debian/rules b/debian/rules
index 298926fb5b11ea56e5a78c48c76481bfc5aded73..0874ec68bc7eecc197d14dbb7ce5aee8c1447f20 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,5 @@ include /usr/share/cdbs/1/class/autotools.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-backend=dynamic
 
-DEB_MAKE_INSTALL_TARGET :=
-
 # Woody doesn't like this of course
 #CFLAGS += -std=gnu99