[Spread-cvs] cvs commit: spread/daemon Makefile.in
jonathan at spread.org
jonathan at spread.org
Fri Sep 27 18:39:00 EDT 2002
jonathan 02/09/27 22:39:00
Modified: daemon Makefile.in
Log:
Fix install option from separate build directory.
Add additional man pages to list of installed pages.
Revision Changes Path
1.4 +24 -11 spread/daemon/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /storage/cvsroot/spread/daemon/Makefile.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.in 25 Sep 2002 18:29:19 -0000 1.3
+++ Makefile.in 27 Sep 2002 22:38:59 -0000 1.4
@@ -66,8 +66,8 @@
MONITOROBJS= monitor.o alarm.o events.o memory.o data_link.o lex.yy.o y.tab.o configuration.o skiplist.o acm.o
-MANPAGES = docs/SP_connect.3.out docs/SP_disconnect.3.out docs/SP_equal_group_ids.3.out docs/SP_error.3.out docs/SP_join.3.out docs/SP_leave.3.out docs/SP_multicast.3.out docs/SP_multigroup_multicast.3.out docs/SP_multigroup_scat_multicast.3.out docs/SP_poll.3.out docs/SP_receive.3.out docs/SP_scat_multicast.3.out docs/SP_scat_receive.3.out docs/spread.1.out
-MANPAGES_IN = docs/SP_connect.3 docs/SP_disconnect.3 docs/SP_equal_group_ids.3 docs/SP_error.3 docs/SP_join.3 docs/SP_leave.3 docs/SP_multicast.3 docs/SP_multigroup_multicast.3 docs/SP_multigroup_scat_multicast.3 docs/SP_poll.3 docs/SP_receive.3 docs/SP_scat_multicast.3 docs/SP_scat_receive.3 docs/spread.1
+MANPAGES = docs/SP_connect.3.out docs/SP_disconnect.3.out docs/SP_equal_group_ids.3.out docs/SP_error.3.out docs/SP_join.3.out docs/SP_leave.3.out docs/SP_multicast.3.out docs/SP_multigroup_multicast.3.out docs/SP_multigroup_scat_multicast.3.out docs/SP_poll.3.out docs/SP_receive.3.out docs/SP_scat_multicast.3.out docs/SP_scat_receive.3.out docs/libsp.3.out docs/spread.1.out docs/spuser.1.out docs/sptuser.1.out docs/spmonitor.1.out docs/spflooder.1.out
+MANPAGES_IN = docs/SP_connect.3 docs/SP_disconnect.3 docs/SP_equal_group_ids.3 docs/SP_error.3 docs/SP_join.3 docs/SP_leave.3 docs/SP_multicast.3 docs/SP_multigroup_multicast.3 docs/SP_multigroup_scat_multicast.3 docs/SP_poll.3 docs/SP_receive.3 docs/SP_scat_multicast.3 docs/SP_scat_receive.3 docs/libsp.3 docs/spread.1 docs/spuser.1 docs/sptuser.1 docs/spmonitor.1 docs/spflooder.1
MANTYPE = @MANTYPE@
PATHSUBS = \
@@ -120,14 +120,14 @@
$(SOFTLINK) libspread.$(LIBVERSION).dylib $@
install-libspread.dylib: libspread.dylib
- $(INSTALL) -m 0755 -s libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBVERSION).dylib
+ $(INSTALL) -m 0755 libspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libspread.$(LIBVERSION).dylib
(cd $(DESTDIR)$(libdir); $(SOFTLINK) libspread.$(LIBVERSION).dylib libspread.dylib)
libspread.so: $(LIBSP_SHOBJS)
$(SHLD) -o $@ $(LIBSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS)
install-libspread.so: libspread.so
- $(INSTALL) -m 0755 -s libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBVERSION)
+ $(INSTALL) -m 0755 libspread.so $(DESTDIR)$(libdir)/libspread.so.$(LIBVERSION)
(cd $(DESTDIR)$(libdir); $(SOFTLINK) libspread.so.$(LIBVERSION) libspread.so)
libtspread.a: $(LIBTSP_OBJS)
@@ -139,14 +139,14 @@
$(SOFTLINK) libtspread.$(LIBVERSION).dylib $@
install-libtspread.dylib: libtspread.dylib
- $(INSTALL) -m 0755 -s libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib
+ $(INSTALL) -m 0755 libtspread.$(LIBVERSION).dylib $(DESTDIR)$(libdir)/libtspread.$(LIBVERSION).dylib
(cd $(DESTDIR)$(libdir); $(SOFTLINK) libtspread.$(LIBVERSION).dylib libtspread.dylib)
libtspread.so: $(LIBTSP_SHOBJS)
$(SHLD) -o $@ $(LIBTSP_SHOBJS) $(SHLDFLAGS) $(SHLIBS) $(THLIBS)
install-libtspread.so: libtspread.so
- $(INSTALL) -m 0755 -s libtspread.so $(DESTDIR)$(libdir)/libtspread.so.$(LIBVERSION)
+ $(INSTALL) -m 0755 libtspread.so $(DESTDIR)$(libdir)/libtspread.so.$(LIBVERSION)
(cd $(DESTDIR)$(libdir); $(SOFTLINK) libtspread.so.$(LIBVERSION) libtspread.so)
spread$(EXEEXT): $(SPREADOBJS)
@@ -168,15 +168,18 @@
$(LD) -o $@ simple_user.o $(LDFLAGS) libspread.a $(LIBS)
$(MANPAGES): $(MANPAGES_IN)
+ @if [ ! -d docs ]; then \
+ $(buildtoolsdir)/mkinstalldirs docs; \
+ fi
@if test "$(MANTYPE)" = "cat"; then \
manpage=$(srcdir)/`echo $@ | sed 's/\.[1-9]\.out$$/\.0/'`; \
else \
manpage=$(srcdir)/`echo $@ | sed 's/\.out$$//'`; \
fi; \
if test "$(MANTYPE)" = "man"; then \
- $(FIXPATHSCMD) $${manpage} | $(PERL) $(buildtoolsdir)/mdoc2man.pl > $(srcdir)/$@; \
+ $(FIXPATHSCMD) $${manpage} | $(PERL) $(buildtoolsdir)/mdoc2man.pl > $@; \
else \
- $(FIXPATHSCMD) $${manpage} > $(srcdir)/$@; \
+ $(FIXPATHSCMD) $${manpage} > $@; \
fi
clean:
@@ -217,9 +220,14 @@
$(INSTALL) -m 0755 -s sptuser$(EXEEXT) $(DESTDIR)$(bindir)/sptuser$(EXEEXT)
$(INSTALL) -m 0755 -s spflooder$(EXEEXT) $(DESTDIR)$(bindir)/spflooder$(EXEEXT)
$(INSTALL) -m 0755 -s spread$(EXEEXT) $(DESTDIR)$(sbindir)/spread$(EXEEXT)
- $(INSTALL) -m 644 -s libspread.a $(DESTDIR)$(libdir)/libspread.a
- $(INSTALL) -m 644 -s libtspread.a $(DESTDIR)$(libdir)/libtspread.a
+ $(INSTALL) -m 644 libspread.a $(DESTDIR)$(libdir)/libspread.a
+ $(INSTALL) -m 644 libtspread.a $(DESTDIR)$(libdir)/libtspread.a
$(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
+ $(INSTALL) -m 644 docs/spflooder.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/spflooder.1
+ $(INSTALL) -m 644 docs/spmonitor.1.out $(DESTDIR)$(mandir)/$(mansubdir)1/spmonitor.1
+ $(INSTALL) -m 644 docs/libsp.3.out $(DESTDIR)$(mandir)/$(mansubdir)3/libsp.3
for page in connect disconnect equal_group_ids error join leave multicast multigroup_multicast multigroup_scat_multicast poll receive scat_multicast scat_receive; \
do \
$(INSTALL) -m 644 docs/SP_$$page.3.out $(DESTDIR)$(mandir)/$(mansubdir)3/SP_$$page.3; \
@@ -228,7 +236,7 @@
$(buildtoolsdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \
fi
if [ ! -f $(DESTDIR)$(sysconfdir)/spread.conf ]; then \
- $(INSTALL) -m 644 sample.spread.conf $(DESTDIR)$(sysconfdir)/spread.conf; \
+ $(INSTALL) -m 644 $(srcdir)/sample.spread.conf $(DESTDIR)$(sysconfdir)/spread.conf; \
else \
echo "$(DESTDIR)$(sysconfdir)/spread.conf already exists, install will not overwrite"; \
fi
@@ -252,4 +260,9 @@
-rm -f $(DESTDIR)$(libdir)/libspread.a
-rm -f $(DESTDIR)$(libdir)/libtspread.a
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)3/SP_*.3
+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)3/libsp.3
-rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/spread.1
+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/spuser.1
+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/sptuser.1
+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/spflooder.1
+ -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/spmonitor.1
More information about the Spread-cvs
mailing list