[Spread-cvs] cvs commit: spread/daemon configure.in configure Makefile.in
jonathan at spread.org
jonathan at spread.org
Tue Oct 1 17:02:14 EDT 2002
jonathan 02/10/01 17:02:14
Modified: daemon configure.in configure Makefile.in
Log:
Add the include directory to list of install locations and install include files.
Fix 'make parser' so it works in subdirectories
Change softlinks of libraries to force the link (-f) so it overwrites existing links.
Revision Changes Path
1.4 +4 -2 spread/daemon/configure.in
Index: configure.in
===================================================================
RCS file: /storage/cvsroot/spread/daemon/configure.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure.in 25 Sep 2002 16:35:26 -0000 1.3
+++ configure.in 1 Oct 2002 21:02:13 -0000 1.4
@@ -707,6 +707,7 @@
G=`eval echo ${piddir}` ; G=`eval echo ${G}`
H=`eval echo ${LIBSPSO}`; H=`eval echo ${H}`
I=`eval echo ${LIBTSPSO}`; I=`eval echo ${I}`
+J=`eval echo ${includedir}`; J=`eval echo ${J}`
echo ""
echo "Spread has been configured with the following options:"
@@ -714,8 +715,9 @@
echo " System binaries: $C"
echo " Configuration files: $D"
echo " User libraries: $E"
-echo " Shared Spread LIbrary: $H"
-echo "Shared Thread-safe Spread LIbrary: $I"
+echo " Shared Spread Library: $H"
+echo "Shared Thread-safe Spread Library: $I"
+echo " Header files: $J"
echo " Manual pages: $F"
echo " PID file: $G"
echo " Manpage format: $MANTYPE"
1.4 +4 -2 spread/daemon/configure
Index: configure
===================================================================
RCS file: /storage/cvsroot/spread/daemon/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- configure 25 Sep 2002 16:35:26 -0000 1.3
+++ configure 1 Oct 2002 21:02:13 -0000 1.4
@@ -3956,6 +3956,7 @@
G=`eval echo ${piddir}` ; G=`eval echo ${G}`
H=`eval echo ${LIBSPSO}`; H=`eval echo ${H}`
I=`eval echo ${LIBTSPSO}`; I=`eval echo ${I}`
+J=`eval echo ${includedir}`; J=`eval echo ${J}`
echo ""
echo "Spread has been configured with the following options:"
@@ -3963,8 +3964,9 @@
echo " System binaries: $C"
echo " Configuration files: $D"
echo " User libraries: $E"
-echo " Shared Spread LIbrary: $H"
-echo "Shared Thread-safe Spread LIbrary: $I"
+echo " Shared Spread Library: $H"
+echo "Shared Thread-safe Spread Library: $I"
+echo " Header files: $J"
echo " Manual pages: $F"
echo " PID file: $G"
echo " Manpage format: $MANTYPE"
1.5 +15 -6 spread/daemon/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /storage/cvsroot/spread/daemon/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile.in 27 Sep 2002 22:38:59 -0000 1.4
+++ Makefile.in 1 Oct 2002 21:02:14 -0000 1.5
@@ -5,6 +5,7 @@
bindir=@bindir@
sbindir=@sbindir@
libdir=@libdir@
+includedir=@includedir@
mandir=@mandir@
mansubdir=@mansubdir@
sysconfdir=@sysconfdir@
@@ -94,8 +95,8 @@
$(SHCC) $(SHCFLAGS) $(SHCPPFLAGS) -D_REENTRANT -c $< -o $*.tlo
parser:
- $(YACC) -d config_parse.y
- $(LEX) config_gram.l
+ $(YACC) -d $(srcdir)/config_parse.y
+ $(LEX) $(srcdir)/config_gram.l
#Disabled now because of timestamp errors causing extra regeneration
#To build parser run "make parser" after ./configure is run.
@@ -121,14 +122,14 @@
install-libspread.dylib: libspread.dylib
$(INSTALL) -m 0755 libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBVERSION).dylib
- (cd $(DESTDIR)$(libdir); $(SOFTLINK) libspread.$(LIBVERSION).dylib libspread.dylib)
+ (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libspread.$(LIBVERSION).dylib libspread.dylib)
libspread.so: $(LIBSP_SHOBJS)
$(SHLD) -o $@ $(LIBSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS)
install-libspread.so: libspread.so
$(INSTALL) -m 0755 libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBVERSION)
- (cd $(DESTDIR)$(libdir); $(SOFTLINK) libspread.so.$(LIBVERSION) libspread.so)
+ (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libspread.so.$(LIBVERSION) libspread.so)
libtspread.a: $(LIBTSP_OBJS)
$(AR) rv $@ $(LIBTSP_OBJS)
@@ -140,14 +141,14 @@
install-libtspread.dylib: libtspread.dylib
$(INSTALL) -m 0755 libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib
- (cd $(DESTDIR)$(libdir); $(SOFTLINK) libtspread.$(LIBVERSION).dylib libtspread.dylib)
+ (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libtspread.$(LIBVERSION).dylib libtspread.dylib)
libtspread.so: $(LIBTSP_SHOBJS)
$(SHLD) -o $@ $(LIBTSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS) $(THLIBS)
install-libtspread.so: libtspread.so
$(INSTALL) -m 0755 libtspread.so $(DESTDIR)$(libdir)/libtspread.so.$(LIBVERSION)
- (cd $(DESTDIR)$(libdir); $(SOFTLINK) libtspread.so.$(LIBVERSION) libtspread.so)
+ (cd $(DESTDIR)$(libdir); $(SOFTLINK) -f libtspread.so.$(LIBVERSION) libtspread.so)
spread$(EXEEXT): $(SPREADOBJS)
$(LD) -o $@ $(SPREADOBJS) $(LDFLAGS) $(LIBS)
@@ -215,6 +216,7 @@
$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)1
$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(mandir)/$(mansubdir)3
$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(libdir)
+ $(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(includedir)
$(INSTALL) -m 0755 -s spmonitor$(EXEEXT) $(DESTDIR)$(bindir)/spmonitor$(EXEEXT)
$(INSTALL) -m 0755 -s spuser$(EXEEXT) $(DESTDIR)$(bindir)/spuser$(EXEEXT)
$(INSTALL) -m 0755 -s sptuser$(EXEEXT) $(DESTDIR)$(bindir)/sptuser$(EXEEXT)
@@ -222,6 +224,9 @@
$(INSTALL) -m 0755 -s spread$(EXEEXT) $(DESTDIR)$(sbindir)/spread$(EXEEXT)
$(INSTALL) -m 644 libspread.a $(DESTDIR)$(libdir)/libspread.a
$(INSTALL) -m 644 libtspread.a $(DESTDIR)$(libdir)/libtspread.a
+ $(INSTALL) -m 644 $(srcdir)/sp.h $(DESTDIR)$(includedir)/sp.h
+ $(INSTALL) -m 644 $(srcdir)/sp_func.h $(DESTDIR)$(includedir)/sp_func.h
+ $(INSTALL) -m 644 $(srcdir)/sp_events.h $(DESTDIR)$(includedir)/sp_events.h
$(INSTALL) -m 644 docs/spread.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/spread.1
$(INSTALL) -m 644 docs/spuser.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/spuser.1
$(INSTALL) -m 644 docs/sptuser.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/sptuser.1
@@ -250,6 +255,7 @@
-rmdir $(DESTDIR)$(mandir)/$(mansubdir)3
-rmdir $(DESTDIR)$(mandir)
-rmdir $(DESTDIR)$(libdir)
+ -rmdir $(DESTDIR)$(includedir)
uninstall:
-rm -f $(DESTDIR)$(bindir)/spuser$(EXEEXT)
@@ -259,6 +265,9 @@
-rm -f $(DESTDIR)$(sbindir)/spread$(EXEEXT)
-rm -f $(DESTDIR)$(libdir)/libspread.a
-rm -f $(DESTDIR)$(libdir)/libtspread.a
+ -rm -f $(DESTDIR)$(includedir)/sp.h
+ -rm -f $(DESTDIR)$(includedir)/sp_func.h
+ -rm -f $(DESTDIR)$(includedir)/sp_events.h
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)3/SP_*.3
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)3/libsp.3
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/spread.1
More information about the Spread-cvs
mailing list