From: Jonathan McDowell Date: Sat, 15 Dec 2007 13:38:59 +0000 (+0000) Subject: Add an install target in the Makefile (can't believe we didn't already X-Git-Url: https://git.sommitrealweird.co.uk/onak.git/commitdiff_plain/d9726d0f8fffa6d2f8174bf6f6599b2e01ccbd50?ds=inline;hp=635bd88df1273656324ee0c47dba6275259674b4 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 a6c12c5..39007d5 100644 --- 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 8ea4f3c..81788bf 100644 --- 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 298926f..0874ec6 100755 --- 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