Skip to content
Snippets Groups Projects
Commit 88c0e621 authored by ale's avatar ale
Browse files

a couple of minor fixes to the build system

parent e8ffa36f
No related branches found
No related tags found
No related merge requests found
INSTALL = install
BIN_PROGRAMS = \ BIN_PROGRAMS = \
noblogs \ noblogs \
noblogsmr \ noblogsmr \
...@@ -8,16 +10,17 @@ BIN_PROGRAMS = \ ...@@ -8,16 +10,17 @@ BIN_PROGRAMS = \
LIB_FILES = \ LIB_FILES = \
$(wildcard lib/*.php) $(wildcard lib/*.php)
NOBLOGS_BIN_DIR = @NOBLOGS_BIN_DIR@
NOBLOGS_LIB_DIR = @NOBLOGS_LIB_DIR@ NOBLOGS_LIB_DIR = @NOBLOGS_LIB_DIR@
all: all:
install: install:
$(INSTALL) -d -m 755 $(DESTDIR)$(bindir) $(INSTALL) -d -m 755 $(DESTDIR)$(NOBLOGS_BIN_DIR)
(for f in $(BIN_PROGRAMS) ; do \ (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) done)
$(INSTALL) -d -m 755 $(DESTDIR)$(NOBLOGS_LIB_DIR) $(INSTALL) -d -m 755 $(DESTDIR)$(NOBLOGS_LIB_DIR)
(for f in $(LIB_FILES:lib/%=%) ; do \ (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) done)
...@@ -38,8 +38,16 @@ AC_ARG_WITH(alert-email, ...@@ -38,8 +38,16 @@ AC_ARG_WITH(alert-email,
ALERT_EMAIL="$alert_email" ALERT_EMAIL="$alert_email"
AC_SUBST(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) AC_SUBST(NOBLOGS_LIB_DIR)
NOBLOGS_BIN_DIR="$inst_prefix/bin"
AC_SUBST(NOBLOGS_BIN_DIR)
AC_OUTPUT( AC_OUTPUT(
Makefile Makefile
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment