Improve non-SlashGrid builds

diff --git a/org.gridsite.core/src/Makefile b/org.gridsite.core/src/Makefile
index 0e544d9..193c115 100644 (file)
--- a/org.gridsite.core/src/Makefile
+++ b/org.gridsite.core/src/Makefile
@@ -204,6 +204,7 @@ showx509exts: showx509exts.c libgridsite.a
 slashgrid: slashgrid.c
        gcc -g -o slashgrid -lfuse -lpthread slashgrid.c \
           -D_FILE_OFFSET_BITS=64 -D_REENTRANT -DFUSE_USE_VERSION=22 \
+          $(MYCFLAGS) $(MYLDFLAGS) \
           -I/usr/kerberos/include `curl-config --cflags` \
           `curl-config --libs` -lgridsite -lxml2
 
@@ -283,6 +284,13 @@ install: apidoc
        cp -f gsexec $(prefix)/sbin
        cp -f mod_gridsite.so $(prefix)/lib/httpd/modules
 
+install-slashgrid: slashgrid
+       cp -f slashgrid $(prefix)/sbin
+       cp -f slashgrid.init $(RPM_BUILD_ROOT)/etc/rc.d/init.d/slashgrid
+       mkdir -p $(RPM_BUILD_ROOT)/var/spool/slashgrid/headers
+       mkdir -p $(RPM_BUILD_ROOT)/var/spool/slashgrid/blocks
+       mkdir -p $(RPM_BUILD_ROOT)/var/spool/slashgrid/tmp
+          
 #
 # Distributions
 #

diff --git a/org.gridsite.core/src/gridsite.spec b/org.gridsite.core/src/gridsite.spec
index 2662d20..993da72 100644 (file)
--- a/org.gridsite.core/src/gridsite.spec
+++ b/org.gridsite.core/src/gridsite.spec
@@ -87,16 +87,17 @@ OPENSSL_LIBS=$OPENSSL_LIBS FLAVOR_EXT=$FLAVOR_EXT
 mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
 
 if [ -f /usr/include/fuse/fuse.h ] ; then
- cp -f slashgrid      $RPM_BUILD_ROOT/%{prefix}/sbin/slashgrid
- cp -f slashgrid.init $RPM_BUILD_ROOT/etc/rc.d/init.d/slashgrid
- mkdir -p $RPM_BUILD_ROOT/var/spool/slashgrid/headers
- mkdir -p $RPM_BUILD_ROOT/var/spool/slashgrid/blocks
- mkdir -p $RPM_BUILD_ROOT/var/spool/slashgrid/tmp
+ make install-slashgrid prefix=$RPM_BUILD_ROOT/%{prefix} \
+ OPENSSL_FLAGS=$OPENSSL_FLAGS \
+ OPENSSL_LIBS=$OPENSSL_LIBS FLAVOR_EXT=$FLAVOR_EXT
 else
  echo -e '#!/bin/sh\necho SlashGrid wasnt built since no fuse-devel on build machine)' \
    >$RPM_BUILD_ROOT/%{prefix}/sbin/slashgrid
  echo -e '#!/bin/sh\n# chkconfig: - 90 10\n# description: slashgrid\necho SlashGrid wasnt built since no fuse-devel on build machine' \
    >$RPM_BUILD_ROOT/etc/rc.d/init.d/slashgrid
+ mkdir -p $RPM_BUILD_ROOT/var/spool/slashgrid/headers
+ mkdir -p $RPM_BUILD_ROOT/var/spool/slashgrid/blocks
+ mkdir -p $RPM_BUILD_ROOT/var/spool/slashgrid/tmp
 fi
 
 %post shared