Make install directoty only depend on major/minor and bump to 1.0.1.

flightaware · May 12, 2017 · eb456b4 · eb456b4
1 parent b42730e
commit eb456b4
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -20,6 +20,7 @@
 #========================================================================
 
 #SAMPLE_NEW_VAR = @SAMPLE_NEW_VAR@
+PKG_MAJ_MIN = @PKG_MAJ_MIN@
 
 #========================================================================
 # Nothing of the variables below this line should need to be changed.
@@ -80,7 +81,7 @@ mandir = @mandir@
 
 DESTDIR =
 
-PKG_DIR = $(PACKAGE_NAME)$(PACKAGE_VERSION)
+PKG_DIR = $(PACKAGE_NAME)$(PKG_MAJ_MIN)
 pkgdatadir = $(datadir)/$(PKG_DIR)
 pkglibdir = $(libdir)/$(PKG_DIR)
 pkgincludedir = $(includedir)/$(PKG_DIR)

diff --git a/configure.in b/configure.in
@@ -18,7 +18,13 @@ dnl to configure the system for the local environment.
 # so you can encode the package version directly into the source files.
 #-----------------------------------------------------------------------
 
-AC_INIT([zookeeper], [1.0])
+AC_INIT([zookeeper], [1.0.1])
+
+#--------------------------------------------------------------------
+#Extract the major.minor part from the 3-part version number
+#--------------------------------------------------------------------
+
+AC_SUBST(PKG_MAJ_MIN,`expr $PACKAGE_VERSION : '\(.*\)\..*'`)
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.