Prepare for 2.3.1

ChangeLog.md

@@ -1,13 +1,25 @@
 GeoIP Update Change Log
 =======================
 
+2.3.1 (2017-01-05)
+------------------
+
+* 2.3.0 was missing `GeoIP.conf.default`. This was added to the dist.
+* The directory creation of `$(sysconfdir)` added in 2.3.0 incorrectly ran if
+  the directory already existed rather than if it did not exist.
+
 2.3.0 (2017-01-04)
 ------------------
 
 * `geoipupdate` now uses TCP keep-alive when compiled with cURL 7.25 or
   greater.
 * Previously, on an invalid gzip file, `geoipupdate` would output binary data
   to stderr. It now displays an appropriate error message.
+* Install README, ChangeLog, GeoIP.conf.default etc into docdir. PR by
+  Philip Prindeville. GitHub #33.
+* `$(sysconfdir)` is now created if it doesn't exist. PR by Philip
+  Prindeville. GitHub #33.
+* The sample config file is now usable. PR by Philip Prindeville. GitHub #33.
 
 2.2.2 (2016-01-21)
 ------------------

conf/Makefile.am

@@ -1,11 +1,13 @@
 DEFAULT_CONFIG_FILE = $(sysconfdir)/GeoIP.conf
 
+EXTRA_DIST=GeoIP.conf.default
+
 install-exec-hook:
-	@if test -d "$(DESTDIR)$(sysconfdir)" ; then \
+	@if [ ! -d "$(DESTDIR)$(sysconfdir)" ]; then \
 		echo "$(MKDIR_P) $(DESTDIR)$(sysconfdir)" ; \
 		$(MKDIR_P) "$(DESTDIR)$(sysconfdir)" ; \
 	fi
-	@if test -f "$(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; then \
+	@if [ -f "$(DESTDIR)$(DEFAULT_CONFIG_FILE)" ]; then \
 	        echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
 	else \
 	        echo "$(INSTALL_DATA) GeoIP.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \