Avoid #warning directives on non-GCC compilers. (bug 7683)

[fontconfig.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 53c1920554e2fd741adf398c568a402af2c31845..2fa3b34c9f24a3f897096caa998ce8a959b8f228 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,13 +22,13 @@
 #  PERFORMANCE OF THIS SOFTWARE.
 
 DOCSRC=@DOCSRC@
-SUBDIRS=fontconfig fc-lang fc-glyphname fc-case 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
@@ -39,6 +39,12 @@ pkgconfig_DATA = fontconfig.pc
 configdir=$(CONFDIR)
 config_DATA=fonts.dtd
 
+if CROSS_COMPILING
+  RUN_FC_CACHE_TEST=false
+else
+  RUN_FC_CACHE_TEST=test -z "$(DESTDIR)"
+endif
+
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(configdir)
        if [ -f $(DESTDIR)$(configdir)/fonts.conf ]; then \
@@ -52,16 +58,16 @@ 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 [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
+       @(if $(RUN_FC_CACHE_TEST); then \
+           echo " fc-cache/fc-cache -s -f -v"; \
+           fc-cache/fc-cache -f -v; \
+       else \
+           echo "***"; \
+           echo "*** Warning: fonts.cache not built"; \
+           echo "***"; \
+           echo "*** Generate this file manually on host system using fc-cache"; \
+           echo "***"; \
+       fi)
 
 uninstall-local:
        if [ -f $(srcdir)/fonts.conf ]; then \
@@ -75,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