From 8f446c205e14cb452a4da276ef44b26f3cdcc68f Mon Sep 17 00:00:00 2001
From: Christian Hohnstaedt <christian@hohnstaedt.de>
Date: Wed, 18 Nov 2009 18:54:05 +0100
Subject: [PATCH] fix/improve build system

 - allow to build without linuxdoc
 - remove xca.dmg and xca.app targets
 - fix clean target in doc
---
 Makefile     | 18 +++++-------------
 configure    |  7 +++++++
 doc/Makefile |  3 ++-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 10609376..a5b137e3 100644
--- a/Makefile
+++ b/Makefile
@@ -55,6 +55,11 @@ dist: lang doc
 	git archive --format=tar --prefix=$(TARGET)/ $(TAG) | \
 		gzip -9 > $(TARGET).tar.gz
 
+snapshot: lang doc
+	HASH=$$(git rev-parse HEAD) && \
+	git archive --format=tar --prefix=xca-$${HASH}/ HEAD | \
+		gzip -9 > xca-$${HASH}.tar.gz
+
 install: xca$(SUFFIX)
 	install -m 755 -d $(destdir)$(prefix)/$(bindir)
 	install -m 755 xca $(destdir)$(prefix)/$(bindir)
@@ -63,19 +68,6 @@ install: xca$(SUFFIX)
 	  $(MAKE) -C $$d install; \
 	done
 
-xca.app: xca$(SUFFIX)
-	rm -rf xca.app
-	mkdir -p xca.app/Contents/MacOS
-	mkdir -p xca.app/Contents/Resources
-	install -m 755 xca xca.app/Contents/MacOS
-	$(STRIP) xca.app/Contents/MacOS/xca
-	for d in $(INSTDIR); do \
-	  $(MAKE) -C $$d APPDIR=$(TOPDIR)/xca.app/Contents app; \
-	done
-
-xca.dmg: xca.app
-	test -x hdiutil
-	hdiutil create -ov -srcfolder $< $@
 
 setup.exe: xca$(SUFFIX) misc/xca.nsi doc lang
 	$(MAKE) -C lang
diff --git a/configure b/configure
index 333b99d0..f8347479 100755
--- a/configure
+++ b/configure
@@ -169,6 +169,13 @@ else
   err "Unable to compile a minimal application look at 'conftest.log' for errors"
 fi
 
+if which linuxdoc 2>&1; then
+  LINUXDOC="linuxdoc"
+else
+  echo "Application 'linuxdoc' not found. No documentation will be generated"
+  LINUXDOC=":"
+fi
+
 findapp() {
   for app in `which $@ 2>/dev/null`; do
     if test -x "$app"; then
diff --git a/doc/Makefile b/doc/Makefile
index 2425e3a9..740f4c4b 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -11,6 +11,7 @@ xca.1.gz: xca.1
 	gzip -9 <$^ >$@
 
 xca.html: xca.sgml
+	echo '<h1>No documentation generated</h1>' > $@
 	$(LINUXDOC) -B html $<
 
 install: xca.1.gz xca.html
@@ -20,7 +21,7 @@ install: xca.1.gz xca.html
 	install xca.1.gz $(destdir)$(prefix)/$(mandir)/man1
 
 clean:
-	$(RM) xca.1.gz
+	$(RM) xca.1.gz xca*.html
 
 app: xca.html
 	mkdir -p $(APPDIR)/Resources