From a327c15187c8d4d6f43b728fb02d4a02b175757e Mon Sep 17 00:00:00 2001 From: Sam Hartman Date: Mon, 9 May 2011 17:07:23 -0400 Subject: [PATCH] Build fixes to support DESTDIR --- Makefile.in | 11 ++++++++++- configure.in | 1 + 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 2020782..f5b3e07 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,6 +2,13 @@ APXS = @APXS@ GSS_CPPFLAGS = @GSS_CPPFLAGS@ GSS_LDFLAGS = @GSS_LDFLAGS@ @LIBS@ SPNEGO_SRCS = @SPNEGO_SRCS@ +INSTALL=@INSTALL@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libexecdir=@libexecdir@ +sysconfdir=@sysconfdir@ +libdir=@libdir@ + CPPFLAGS = -I. -Ispnegokrb5 $(GSS_CPPFLAGS) $(DEFS) LDFLAGS = $(GSS_LDFLAGS) @@ -15,7 +22,9 @@ mod_auth_gssapi.la: $(SRCS) ./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" "${SRCS}" "${APXS} -c" install: mod_auth_gssapi.la - ./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" $^ "${APXS} -i -A -n auth_gssapi" + $(INSTALL) -d $(DESTDIR)${libdir}/apache2/modules + $(INSTALL) -d $(DESTDIR)${sysconfdir}/apache2/mods-available + ./apxs.sh "${CPPFLAGS}" "${LDFLAGS}" $^ "${APXS} -i -A -S LIBEXECDIR=$(DESTDIR)${libdir}/apache2/modules -S SYSCONFDIR=$(DESTDIR)${sysconfdir}/apache2 -n auth_gssapi" clean: for i in . spnegokrb5; do \ diff --git a/configure.in b/configure.in index 413b539..ad9480d 100644 --- a/configure.in +++ b/configure.in @@ -7,6 +7,7 @@ AC_CONFIG_HEADER([config.h]) # Checks for programs. AC_PROG_CC AC_PROG_MAKE_SET +AC_PROG_INSTALL # Checks for header files. AC_HEADER_STDC -- 2.1.4