From 88c0e621bfd7b1c782f9ad8619a6c295a7c52dde Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Mon, 18 Nov 2013 13:28:08 +0000
Subject: [PATCH] a couple of minor fixes to the build system

---
 Makefile.in  |  9 ++++++---
 configure.ac | 10 +++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 207b911..ee339ca 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,6 @@
 
+INSTALL = install
+
 BIN_PROGRAMS = \
 	noblogs \
 	noblogsmr \
@@ -8,16 +10,17 @@ BIN_PROGRAMS = \
 LIB_FILES = \
 	$(wildcard lib/*.php)
 
+NOBLOGS_BIN_DIR = @NOBLOGS_BIN_DIR@
 NOBLOGS_LIB_DIR = @NOBLOGS_LIB_DIR@
 
 all:
 
 install:
-	$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+	$(INSTALL) -d -m 755 $(DESTDIR)$(NOBLOGS_BIN_DIR)
 	(for f in $(BIN_PROGRAMS) ; do \
-		$(INSTALL) -m 755 $(srcdir)/bin/$$f $(DESTDIR)$(bindir)/$$f ; \
+		$(INSTALL) -m 755 bin/$$f $(DESTDIR)$(NOBLOGS_BIN_DIR)/$$f ; \
 	 done)
 	$(INSTALL) -d -m 755 $(DESTDIR)$(NOBLOGS_LIB_DIR)
 	(for f in $(LIB_FILES:lib/%=%) ; do \
-		$(INSTALL) -m 755 $(srcdir)/lib/$$f $(DESTDIR)$(NOBLOGS_LIB_DIR)/$$f ; \
+		$(INSTALL) -m 755 lib/$$f $(DESTDIR)$(NOBLOGS_LIB_DIR)/$$f ; \
 	 done)
diff --git a/configure.ac b/configure.ac
index 5e5eb98..2449577 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,8 +38,16 @@ AC_ARG_WITH(alert-email,
 ALERT_EMAIL="$alert_email"
 AC_SUBST(ALERT_EMAIL)
 
-NOBLOGS_LIB_DIR=`eval echo "$prefix/lib/noblogs-cli"`
+dnl We need to look at the value of --prefix *now*, not later.
+inst_prefix="$prefix"
+if test "$prefix" = "NONE" ; then
+  inst_prefix="$ac_default_prefix"
+fi
+  
+NOBLOGS_LIB_DIR="$inst_prefix/lib/noblogs-cli"
 AC_SUBST(NOBLOGS_LIB_DIR)
+NOBLOGS_BIN_DIR="$inst_prefix/bin"
+AC_SUBST(NOBLOGS_BIN_DIR)
 
 AC_OUTPUT(
 Makefile
-- 
GitLab