X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=Makefile.am;h=90825bab58ceafb06c49d2119af626dc89cd4b71;hb=c02886485b293179e8492cad9a34eb431dd4bfc9;hp=16d2f218e34eff8ceba3f77a36d6935e0d3360dc;hpb=d8ae9c92197f1f2782b9decb276f6da756ce882d;p=fontconfig.git

diff --git a/Makefile.am b/Makefile.am
index 16d2f21..90825ba 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,13 +22,13 @@
 #  PERFORMANCE OF THIS SOFTWARE.
 
 DOCSRC=@DOCSRC@
-SUBDIRS=fontconfig fc-case fc-lang fc-glyphname src fc-cache fc-list fc-match $(DOCSRC) test
-
+SUBDIRS=fontconfig fc-case fc-lang fc-glyphname fc-arch src \
+	fc-cache fc-cat fc-list fc-match conf.d $(DOCSRC) test
+	 
 EXTRA_DIST = \
         fontconfig.pc.in \
         fonts.conf.in \
 	fonts.dtd \
-	local.conf \
         fontconfig.spec.in \
         fontconfig.spec \
 	fontconfig-zip.in
@@ -58,16 +58,7 @@ install-data-local:
 	  echo " $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf"; \
 	  $(INSTALL_DATA) fonts.conf $(DESTDIR)$(configdir)/fonts.conf; \
 	fi; fi
-	if [ -f $(DESTDIR)$(configdir)/local.conf ]; then \
-	  echo "not overwriting existing $(DESTDIR)$(configdir)/local.conf"; \
-	else if [ -f $(srcdir)/local.conf ]; then \
-	  echo " $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf"; \
-	  $(INSTALL_DATA) $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf; \
-	else if [ -f local.conf ]; then \
-	  echo " $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf"; \
-	  $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \
-	fi; fi; fi
-	if $(RUN_FC_CACHE_TEST); then \
+	@(if $(RUN_FC_CACHE_TEST); then \
 	    echo " fc-cache/fc-cache -f -v"; \
 	    fc-cache/fc-cache -f -v; \
 	else \
@@ -76,7 +67,7 @@ install-data-local:
 	    echo "***"; \
 	    echo "*** Generate this file manually on host system using fc-cache"; \
 	    echo "***"; \
-	fi
+	fi)
 
 uninstall-local:
 	if [ -f $(srcdir)/fonts.conf ]; then \
@@ -90,14 +81,15 @@ uninstall-local:
 	     rm -f $(DESTDIR)$(configdir)/fonts.conf; \
 	  fi; \
 	fi; fi
-	if [ -f $(srcdir)/local.conf ]; then \
-	  if cmp -s $(srcdir)/local.conf $(DESTDIR)$(configdir)/local.conf; then \
-	     echo " uninstall standard $(DESTDIR)$(configdir)/local.conf"; \
-	     rm -f $(DESTDIR)$(configdir)/local.conf; \
-	  fi; \
-	else if [ -f local.conf ]; then \
-	  if cmp -s local.conf $(DESTDIR)$(configdir)/local.conf; then \
-	     echo " uninstall standard $(DESTDIR)$(configdir)/local.conf"; \
-	     rm -f $(DESTDIR)$(configdir)/local.conf; \
-	  fi; \
-	fi; fi
+
+debuild debuild-signed: debuild-dirs
+	(cd $(distdir)/debian && debuild)
+
+debuild-unsigned: debuild-dirs
+	(cd $(distdir)/debian && debuild -us -uc)
+
+debuild-dirs: distdir
+	rm -f $(PACKAGE)_$(VERSION).orig.tar.gz
+	rm -rf $(distdir).orig
+	cp -a $(distdir) $(distdir).orig
+	rm -rf $(distdir).orig/debian