X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=Makefile;h=dfeb3f10a266d46bfe2d9c74230dfb1c53fa3259;hb=11cd8c4839367d87b0dbcb58f46e81391c0dac1c;hp=98d265e5c1fc4b3aa45f8e894eef8785e7f6df2b;hpb=e326d7fcd810a69d3558fecdff0500286ddf2ffe;p=monkeysphere.git

diff --git a/Makefile b/Makefile
index 98d265e..dfeb3f1 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,7 @@ MONKEYSPHERE_VERSION = `head -n1 debian/changelog | sed 's/.*(\([^-]*\)-.*/\1/'`
 # these defaults are for debian.  porters should probably adjust them
 # before calling make install
 ETCPREFIX ?= 
+ETCSUFFIX ?= 
 PREFIX ?= /usr
 MANPREFIX ?= $(PREFIX)/share/man
 
@@ -15,7 +16,7 @@ tarball: clean
 	rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 	mkdir -p monkeysphere-$(MONKEYSPHERE_VERSION)/doc
 	ln -s ../../website/getting-started-user.mdwn ../../website/getting-started-admin.mdwn ../../doc/TODO ../../doc/MonkeySpec monkeysphere-$(MONKEYSPHERE_VERSION)/doc
-	ln -s ../COPYING ../etc ../Makefile ../man ../src  monkeysphere-$(MONKEYSPHERE_VERSION)
+	ln -s ../COPYING ../etc ../Makefile ../man ../src ../tests monkeysphere-$(MONKEYSPHERE_VERSION)
 	tar -ch monkeysphere-$(MONKEYSPHERE_VERSION) | gzip -n > monkeysphere_$(MONKEYSPHERE_VERSION).orig.tar.gz
 	rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
@@ -25,6 +26,11 @@ debian-package: tarball
 	(cd monkeysphere-$(MONKEYSPHERE_VERSION) && debuild -uc -us)
 	rm -rf monkeysphere-$(MONKEYSPHERE_VERSION)
 
+# don't explicitly depend on the tarball, since our tarball
+# (re)generation is not idempotent even when no source changes.
+freebsd-distinfo: 
+	./utils/build-freebsd-distinfo
+
 clean:
 	$(MAKE) -C src/keytrans clean
 	# clean up old monkeysphere packages lying around as well.
@@ -40,7 +46,10 @@ install: all installman
 	install src/monkeysphere-server $(DESTDIR)$(PREFIX)/sbin
 	install -m 0644 src/common $(DESTDIR)$(PREFIX)/share/monkeysphere
 	install doc/* $(DESTDIR)$(PREFIX)/share/doc/monkeysphere
-	install -m 0644 etc/* $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere
+	install -m 0644 etc/gnupg-host.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/gnupg-host.conf$(ETCSUFFIX)
+	install -m 0644 etc/gnupg-authentication.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/gnupg-authentication.conf$(ETCSUFFIX)
+	install -m 0644 etc/monkeysphere.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere.conf$(ETCSUFFIX)
+	install -m 0644 etc/monkeysphere-server.conf $(DESTDIR)$(ETCPREFIX)/etc/monkeysphere/monkeysphere-server.conf$(ETCSUFFIX)
 
 installman:
 	mkdir -p $(DESTDIR)$(MANPREFIX)/man1 $(DESTDIR)$(MANPREFIX)/man7 $(DESTDIR)$(MANPREFIX)/man8