From: Keith Packard <keithp@keithp.com>
Date: Sun, 5 Dec 2004 07:44:08 +0000 (+0000)
Subject: Update links to new freedesktop.org locations
X-Git-Tag: fc-2_2_97
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=fc2cc873bb1a715844a1e6f885661bf433bdd7cf;p=fontconfig.git

Update links to new freedesktop.org locations
Add uninstall-local to get rid of fonts.conf and local.conf if they match
    the distributed versions. Fixes 'make distcheck'
---

diff --git a/ChangeLog b/ChangeLog
index 4e00009..4e91846 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-12-04  Keith Packard  <keithp@keithp.com>
+
+	* INSTALL:
+	Update links to new freedesktop.org locations
+	* Makefile.am:
+	Add uninstall-local to get rid of fonts.conf and local.conf if they
+	match the distributed versions.  Fixes 'make distcheck'
+
 2004-12-04  Keith Packard  <keithp@keithp.com>
 
 	* README:
diff --git a/INSTALL b/INSTALL
index 5f511bc..ff067cf 100644
--- a/INSTALL
+++ b/INSTALL
@@ -25,9 +25,9 @@ important steps:
  7.	Split out the ChangeLog into ChangeLog-2.2.xx with
  	the changes since the previous release
  8.	Copy ChangeLog-2.2.xx and fontconfig-2.2.xx.tar.gz to
- 	freedesktop.org:~fontconfig/public_html/release
+ 	freedesktop.org:/srv/fontconfig.freedesktop.org/www/release
  9.	Update the Fontconfig Devel wiki page
- 	http://freedesktop.org/Software/FontconfigDevel
+ 	http://fontconfig.org/wiki/Devel
 10.	Compute md5sums for release files:
 		md5sum fontconfig-2.2.xx.tar.gz ChangeLog-2.2.xx
 11.	Post a note to fontconfig@fontconfig.org.  Include the md5sums.
diff --git a/Makefile.am b/Makefile.am
index c1e48a1..7079027 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,3 +62,27 @@ install-data-local:
 	  $(INSTALL_DATA) local.conf $(DESTDIR)$(configdir)/local.conf; \
 	fi; fi; fi
 	if [ x$(DESTDIR) = x ]; then fc-cache/fc-cache -f -v; fi
+
+uninstall-local:
+	if [ -f $(srcdir)/fonts.conf ]; then \
+	  if cmp -s $(srcdir)/fonts.conf $(DESTDIR)$(configdir)/fonts.conf; then \
+	     echo " uninstall standard $(DESTDIR)$(configdir)/fonts.conf"; \
+	     rm -f $(DESTDIR)$(configdir)/fonts.conf; \
+	  fi; \
+	else if [ -f fonts.conf ]; then \
+	  if cmp -s fonts.conf $(DESTDIR)$(configdir)/fonts.conf; then \
+	     echo " uninstall standard $(DESTDIR)$(configdir)/fonts.conf"; \
+	     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