summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2009-01-23 09:48:07 -0500
committerSimo Sorce <idra@samba.org>2009-01-27 08:41:41 -0500
commit965bd60f9fae579184d3aa0c039775b37d67c27b (patch)
tree254e653b2948ca1117736a3eb475229d7d7b0e45
parentd9f203e045c63c853ae60b47fb8013e92600c9f9 (diff)
downloadsssd-965bd60f9fae579184d3aa0c039775b37d67c27b.tar.gz
sssd-965bd60f9fae579184d3aa0c039775b37d67c27b.tar.bz2
sssd-965bd60f9fae579184d3aa0c039775b37d67c27b.zip
Fixes to the makefile to get make install to work properly
-rw-r--r--server/Makefile.in10
-rw-r--r--server/server.mk4
2 files changed, 11 insertions, 3 deletions
diff --git a/server/Makefile.in b/server/Makefile.in
index b86d8811..6c7bdfd9 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 fd05c170..34ff0162 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)