From 965bd60f9fae579184d3aa0c039775b37d67c27b Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Fri, 23 Jan 2009 09:48:07 -0500
Subject: Fixes to the makefile to get make install to work properly

---
 server/Makefile.in | 10 ++++++++--
 server/server.mk   |  4 +++-
 2 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'server')

diff --git a/server/Makefile.in b/server/Makefile.in
index b86d88110..6c7bdfd96 100644
--- a/server/Makefile.in
+++ b/server/Makefile.in
@@ -6,6 +6,7 @@ exec_prefix = @exec_prefix@
 datarootdir = @datarootdir@
 includedir = @includedir@
 libdir = @libdir@
+libexecdir = @libexecdir@
 bindir = @bindir@
 sbindir = @sbindir@
 mandir = @mandir@
@@ -57,9 +58,10 @@ MDLD_FLAGS = @MDLD_FLAGS@
 
 OBJS = $(SERVER_OBJ) @LIBREPLACEOBJ@ $(EXTRA_OBJ)
 
-headers = .h
+headers =
 
-BINS = sbin/sssd sbin/sssd_nss sbin/sssd_dp sbin/sssd_be
+LIBEXECBINS =  sbin/sssd_nss sbin/sssd_dp sbin/sssd_be
+BINS = sbin/sssd $(LIBEXECBINS)
 SOLIBS = lib/libsss_proxy.$(SHLIBEXT)
 
 DIRS = sbin lib
@@ -93,10 +95,14 @@ installdirs::
 	mkdir -p $(DESTDIR)$(includedir) $(DESTDIR)$(libdir) $(DESTDIR)$(sbindir)
 
 installheaders:: installdirs
+ifneq (x$(headers), x)
 	cp $(headers) $(DESTDIR)$(includedir)
+endif
 
 installlibs:: installdirs
+ifneq (x$(STATICLIB)$(LIBSOLIB), x)
 	cp $(STATICLIB) $(LIBSOLIB) $(DESTDIR)$(libdir)
+endif
 
 installbin:: installdirs
 
diff --git a/server/server.mk b/server/server.mk
index fd05c1702..34ff01622 100644
--- a/server/server.mk
+++ b/server/server.mk
@@ -33,7 +33,9 @@ NSSSRV_OBJ = \
 
 install:: all
 	${INSTALLCMD} -d $(DESTDIR)$(sbindir)
-	${INSTALLCMD} -m 755 sssd $(DESTDIR)$(sbindir)
+	${INSTALLCMD} -m 700 sbin/sssd $(DESTDIR)$(sbindir)
+	${INSTALLCMD} -d $(libexecdir)
+	${INSTALLCMD} -m 700 $(LIBEXECBINS) $(libexecdir)
 
 sbin/sssd: $(SERVER_OBJ) $(UTIL_OBJ)
 	$(CC) -o sbin/sssd $(SERVER_OBJ) $(UTIL_OBJ) $(LDFLAGS) $(LIBS)
-- 
cgit