Improve install.

Author: weetmuts

Makefile

@@ -26,9 +26,8 @@ HAS_GIT=$(shell git rev-parse --is-inside-work-tree >/dev/null 2>&1 ; echo $$?)
 
 ifneq ($(HAS_GIT), 0)
 # We have no git used manually set version number.
-VERSION:=1.0.0
+VERSION:=$(shell cat dist/VERSION)
 COMMIT_HASH:=
-DEBVERSION:=1.0.0
 else
 # We have git, extract information from it.
     SUPRE=
@@ -50,17 +49,14 @@ else
     ifeq ($(COMMIT),$(TAG_COMMIT))
         # Exactly on the tagged commit. The version is the tag!
         VERSION:=$(TAG)
-        DEBVERSION:=$(TAG)
     else
         VERSION:=$(TAG)++
-        DEBVERSION:=$(TAG)++
     endif
 
     ifneq ($(strip $(CHANGES)),)
         # There are changes, signify that with a +changes
         VERSION:=$(VERSION) with uncommitted changes
         COMMIT_HASH:=$(COMMIT_HASH) but with uncommitted changes
-        DEBVERSION:=$(DEBVERSION)l
     endif
 
 endif
@@ -129,6 +125,7 @@ lcov:
 	@for x in $(BUILDDIRS); do echo; echo Bulding $$(basename $$x) ; $(MAKE) --no-print-directory -C $$x debug lcov ; done
 
 dist:
+	@echo "$(VERSION)" | cut -f 1 -d '-' > dist/VERSION
 	@cat CHANGES | sed '/20..-..-..:/q'  | head -n -1 | sed '$d' > RELEASE
 	@rm -f dist/xmq.c dist/xmq.h
 	@$(MAKE) --no-print-directory -C $(FIRSTDIR) release $(shell pwd)/dist/xmq.c $(shell pwd)/dist/xmq.h
@@ -176,14 +173,10 @@ clean-all:
 
 DESTDIR?=/usr/local
 install:
-	install -Dm 755 -s build/default/release/xmq $(DESTDIR)/bin/xmq
-	install -Dm 644 doc/xmq.1 $(DESTDIR)/man/man1/xmq.1
-	install -Dm 644 scripts/autocompletion_for_xmq.sh /etc/bash_completion.d/xmq
+	@./install.sh build/default/release $(DESTDIR)
 
 uninstall:
-	rm -f $(DESTDIR)/bin/xmq
-	rm -f $(DESTDIR)/man/man1/xmq.1
-	rm -f /etc/bash_completion.d/xmq
+	@./uninstall.sh $(DESTDIR)
 
 linux64:
 

RELEASE

@@ -1,5 +0,0 @@
-
-
-Steven Pemberton noticed that xmq wrongly reported some IXML grammars
-as ambiguous even though they weren't. This is now fixed. Thanks Steven!
-

VERSION

@@ -8,6 +8,7 @@ PATH_SEP="@PATH_SEP@"
 SRC_ROOT="@SRC_ROOT@"
 BUILD_ROOT="@BUILD_ROOT@"
 OUTPUT_ROOT="@OUTPUT_ROOT@"
+PREFIX="@PREFIX@"
 
 ENABLE_STATIC_XMQ="@ENABLE_STATIC_XMQ@"
 

autoconf/spec.inc.in

@@ -21,6 +21,7 @@ PATH_SEP:=@PATH_SEP@
 SRC_ROOT:=@SRC_ROOT@
 BUILD_ROOT:=@BUILD_ROOT@
 OUTPUT_ROOT:=@OUTPUT_ROOT@
+PREFIX:=@PREFIX@
 
 ENABLE_STATIC_XMQ:=@ENABLE_STATIC_XMQ@
 

autoconf/spec.mk.in

@@ -657,6 +657,7 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
+PREFIX
 BUILD_ROOT
 OUTPUT_ROOT
 SRC_ROOT
@@ -2486,6 +2487,12 @@ ln -s "$OUTPUT_ROOT" "$SRC_ROOT/build/default"
 
 
 
+if test "x$prefix" = "xNONE"; then
+    PREFIX="$ac_default_prefix"
+else
+    PREFIX="$prefix"
+fi
+
 
 
 

configure

@@ -108,6 +108,12 @@ AC_SUBST(CONF_NAME)
 AC_SUBST(SRC_ROOT)
 AC_SUBST(OUTPUT_ROOT)
 AC_SUBST(BUILD_ROOT)
+AC_SUBST(PREFIX)
+if test "x$prefix" = "xNONE"; then
+    PREFIX="$ac_default_prefix"
+else
+    PREFIX="$prefix"
+fi
 
 AC_HEADER_STAT
 

configure.ac

@@ -0,0 +1 @@
+3.1.1

dist/VERSION

@@ -0,0 +1,39 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "" ] || [ "$1" = "-h" ]
+then
+    echo "Usage: install.sh [build_dir] [dest_dir]
+    Example: install.sh build/default/release /usr/local
+    "
+    exit 0
+fi
+
+FROM="$1"
+DESTDIR="$2"
+
+if [ ! -f "$FROM/../spec.inc" ]
+then
+    echo "Oups, please supply a build dir such as build/default/release"
+    exit 1
+fi
+
+if [ ! -d "$DESTDIR" ]
+then
+    echo "Oups, please supply a valid dest_dir directory."
+    exit 1
+fi
+
+#. "${FROM}/../spec.inc"
+
+install -Dm 755 -s "${FROM}/xmq" "${DESTDIR}/bin/xmq"
+install -Dm 644 -s "${FROM}/libxmq.a" "${DESTDIR}/lib/libxmq.a"
+install -Dm 644 -s "${FROM}/libxmq.so" "${DESTDIR}/lib/libxmq.so"
+cp "src/main/c/xmq.h" "${DESTDIR}/include/xmq.h"
+chmod 644 "src/main/c/xmq.h"
+install -Dm 644 "doc/xmq.1" "${DESTDIR}/man/man1/xmq.1"
+install -Dm 644 "scripts/autocompletion_for_xmq.sh" "${DESTDIR}/share/bash-completion/completions/xmq"
+
+echo
+echo "xmq and libxmq sucessfully installed."

install.sh

@@ -203,7 +203,7 @@ $(SRC_ROOT)/dist/xmq.h: $(SRC_ROOT)/src/main/c/xmq.h
 	@cp $< $@
 	@echo "Copied dist/xmq.h"
 
-$(SRC_ROOT)/dist/xmq.c: $(SRC_ROOT)/src/main/c/xmq.c $(PARTS_SOURCES) $(SRC_ROOT)/VERSION $(OUTPUT_ROOT)/update_yaep
+$(SRC_ROOT)/dist/xmq.c: $(SRC_ROOT)/src/main/c/xmq.c $(PARTS_SOURCES) $(SRC_ROOT)/build/VERSION $(OUTPUT_ROOT)/update_yaep
 	$(AT)$(SRC_ROOT)/scripts/build_xmq_from_parts.sh $(OUTPUT_ROOT) $<
 	$(AT)cp $(OUTPUT_ROOT)/xmq-in-progress $(SRC_ROOT)/dist/xmq.c
 	@echo "Generated dist/xmq.c"