guile/guile-oops ChangeLog Makefile.am Makefile...

[Mikael Djurfeldt]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Mikael Djurfeldt <address@hidden>       01/03/04 21:33:03

Modified files:
        guile-oops     : ChangeLog Makefile.am Makefile.in configure 
                         configure.in 

Log message:
        * Makefile.am (man_MANS): Install manpage.
        
        * configure.in (GUILEVERSION): Set to version of Guile.
        
        * Makefile.am: Use GUILEVERSION in installpaths.
        Use relpath to install relative links for libgoopscore.

CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/ChangeLog.diff?r1=1.133&r2=1.134
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/Makefile.am.diff?r1=1.35&r2=1.36
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/Makefile.in.diff?r1=1.42&r2=1.43
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/configure.diff?r1=1.17&r2=1.18
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-oops/configure.in.diff?r1=1.17&r2=1.18

Patches:
Index: guile/guile-oops/ChangeLog
diff -u guile/guile-oops/ChangeLog:1.133 guile/guile-oops/ChangeLog:1.134
--- guile/guile-oops/ChangeLog:1.133    Sun Mar  4 18:48:41 2001
+++ guile/guile-oops/ChangeLog  Sun Mar  4 21:33:02 2001
@@ -1,3 +1,16 @@
+2001-03-05  Mikael Djurfeldt  <address@hidden>
+
+       * Makefile.am (man_MANS): Install manpage.
+
+       * guile-oops.1: Manpage from Guile distribution.
+
+       * relpath: New script.
+
+       * configure.in (GUILEVERSION): Set to version of Guile.
+
+       * Makefile.am: Use GUILEVERSION in installpaths.
+       Use relpath to install relative links for libgoopscore.
+
 2001-03-04  Mikael Djurfeldt  <address@hidden>
 
        * GOOPS-VERSION
Index: guile/guile-oops/Makefile.am
diff -u guile/guile-oops/Makefile.am:1.35 guile/guile-oops/Makefile.am:1.36
--- guile/guile-oops/Makefile.am:1.35   Thu Feb 22 11:07:47 2001
+++ guile/guile-oops/Makefile.am        Sun Mar  4 21:33:02 2001
@@ -22,32 +22,37 @@
 ## and not a header -- headers are included in the distribution.
 modinclude_DATA = versiondat.h
 
-subpkgdatadir = $(datadir)/guile/oop
+subpkgdatadir = $(datadir)/guile/@GUILEVERSION@/oop
 subpkgdata_DATA = goops.scm
 
 goops_sources = dispatch.scm compile.scm util.scm stklos.scm \
                describe.scm internal.scm active-slot.scm composite-slot.scm \
                save.scm
 
-goopsdatadir = $(datadir)/guile/oop/goops
+goopsdatadir = $(datadir)/guile/@GUILEVERSION@/oop/goops
 goopsdata_DATA = $(goops_sources)
 
 info_TEXINFOS = goops.texi
 goops_TEXINFOS = goops-tutorial.texi hierarchy.eps hierarchy.txt
 
+man_MANS = guile-oops.1
+
 miscdocs = ANON-CVS COPYRIGHTS HACKING SNAPSHOTS TAGS TODO mop.text
+
+EXTRA_DIST = $(subpkgdata_DATA) $(goops_sources) $(miscdocs) GOOPS-VERSION 
relpath
 
-EXTRA_DIST = $(subpkgdata_DATA) $(goops_sources) $(miscdocs) GOOPS-VERSION
+RELPATH = guile -e main -s $(srcdir)/relpath
 
 install-exec-hook:
        $(mkinstalldirs) $(goopsdatadir)
        (. ./libgoopscore.la; \
+        relpath=`$(RELPATH) $(goopsdatadir) $(libdir)`; \
         test -z "$$dlname" \
         || test ! -r $(libdir)/$$dlname \
         || (cd $(goopsdatadir) \
             && rm -f libgoopscore.la $$dlname \
-            && $(LN_S) $(libdir)/libgoopscore.la \
-            && $(LN_S) $(libdir)/$$dlname))
+            && $(LN_S) $$relpath/libgoopscore.la \
+            && $(LN_S) $$relpath/$$dlname))
 
 dist-hook: goops.ps
        cp -p $(top_builddir)/goops.ps $(distdir)
Index: guile/guile-oops/Makefile.in
diff -u guile/guile-oops/Makefile.in:1.42 guile/guile-oops/Makefile.in:1.43
--- guile/guile-oops/Makefile.in:1.42   Sun Mar  4 18:32:58 2001
+++ guile/guile-oops/Makefile.in        Sun Mar  4 21:33:02 2001
@@ -65,6 +65,7 @@
 GOOPS_MAJOR_VERSION = @GOOPS_MAJOR_VERSION@
 GOOPS_MINOR_VERSION = @GOOPS_MINOR_VERSION@
 GOOPS_VERSION = @GOOPS_VERSION@
+GUILEVERSION = @GUILEVERSION@
 GUILE_CFLAGS = @GUILE_CFLAGS@
 GUILE_LDFLAGS = @GUILE_LDFLAGS@
 LIBGOOPSCORE_MAJOR_VERSION = @LIBGOOPSCORE_MAJOR_VERSION@
@@ -102,21 +103,25 @@
 modincludedir = $(includedir)/goops
 modinclude_DATA = versiondat.h
 
-subpkgdatadir = $(datadir)/guile/oop
+subpkgdatadir = $(datadir)/guile/@GUILEVERSION@/oop
 subpkgdata_DATA = goops.scm
 
 goops_sources = dispatch.scm compile.scm util.scm stklos.scm           
describe.scm internal.scm active-slot.scm composite-slot.scm            save.scm
 
 
-goopsdatadir = $(datadir)/guile/oop/goops
+goopsdatadir = $(datadir)/guile/@GUILEVERSION@/oop/goops
 goopsdata_DATA = $(goops_sources)
 
 info_TEXINFOS = goops.texi
 goops_TEXINFOS = goops-tutorial.texi hierarchy.eps hierarchy.txt
 
+man_MANS = guile-oops.1
+
 miscdocs = ANON-CVS COPYRIGHTS HACKING SNAPSHOTS TAGS TODO mop.text
+
+EXTRA_DIST = $(subpkgdata_DATA) $(goops_sources) $(miscdocs) GOOPS-VERSION 
relpath
 
-EXTRA_DIST = $(subpkgdata_DATA) $(goops_sources) $(miscdocs) GOOPS-VERSION
+RELPATH = guile -e main -s $(srcdir)/relpath
 
 SUFFIXES = .x
 SNARF = guile-snarf
@@ -149,6 +154,10 @@
 INFO_DEPS = goops.info
 DVIS = goops.dvi
 TEXINFOS = goops.texi
+man1dir = $(mandir)/man1
+MANS = $(man_MANS)
+
+NROFF = nroff
 DATA =  $(goopsdata_DATA) $(modinclude_DATA) $(subpkgdata_DATA)
 
 HEADERS =  $(include_HEADERS)
@@ -393,6 +402,45 @@
          fi; \
        done
 
+install-man1:
+       $(mkinstalldirs) $(DESTDIR)$(man1dir)
+       @list='$(man1_MANS)'; \
+       l2='$(man_MANS)'; for i in $$l2; do \
+         case "$$i" in \
+           *.1*) list="$$list $$i" ;; \
+         esac; \
+       done; \
+       for i in $$list; do \
+         if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \
+         else file=$$i; fi; \
+         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+         inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+         echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \
+         $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \
+       done
+
+uninstall-man1:
+       @list='$(man1_MANS)'; \
+       l2='$(man_MANS)'; for i in $$l2; do \
+         case "$$i" in \
+           *.1*) list="$$list $$i" ;; \
+         esac; \
+       done; \
+       for i in $$list; do \
+         ext=`echo $$i | sed -e 's/^.*\\.//'`; \
+         inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
+         inst=`echo $$inst | sed '$(transform)'`.$$ext; \
+         echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \
+         rm -f $(DESTDIR)$(man1dir)/$$inst; \
+       done
+install-man: $(MANS)
+       @$(NORMAL_INSTALL)
+       $(MAKE) $(AM_MAKEFLAGS) install-man1
+uninstall-man:
+       @$(NORMAL_UNINSTALL)
+       $(MAKE) $(AM_MAKEFLAGS) uninstall-man1
+
 install-goopsdataDATA: $(goopsdata_DATA)
        @$(NORMAL_INSTALL)
        $(mkinstalldirs) $(DESTDIR)$(goopsdatadir)
@@ -594,7 +642,7 @@
        $(MAKE) $(AM_MAKEFLAGS) install-exec-hook
 install-exec: install-exec-am
 
-install-data-am: install-info-am install-goopsdataDATA \
+install-data-am: install-info-am install-man install-goopsdataDATA \
                install-modincludeDATA install-subpkgdataDATA \
                install-includeHEADERS
 install-data: install-data-am
@@ -603,20 +651,20 @@
        @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
 uninstall-am: uninstall-libLTLIBRARIES uninstall-binPROGRAMS \
-               uninstall-info uninstall-goopsdataDATA \
+               uninstall-info uninstall-man uninstall-goopsdataDATA \
                uninstall-modincludeDATA uninstall-subpkgdataDATA \
                uninstall-includeHEADERS
 uninstall: uninstall-am
-all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(DATA) \
+all-am: Makefile $(INFO_DEPS) $(LTLIBRARIES) $(PROGRAMS) $(MANS) $(DATA) \
                $(HEADERS)
 all-redirect: all-am
 install-strip:
        $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
 installdirs:
        $(mkinstalldirs)  $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \
-               $(DESTDIR)$(infodir) $(DESTDIR)$(goopsdatadir) \
-               $(DESTDIR)$(modincludedir) $(DESTDIR)$(subpkgdatadir) \
-               $(DESTDIR)$(includedir)
+               $(DESTDIR)$(infodir) $(DESTDIR)$(mandir)/man1 \
+               $(DESTDIR)$(goopsdatadir) $(DESTDIR)$(modincludedir) \
+               $(DESTDIR)$(subpkgdatadir) $(DESTDIR)$(includedir)
 
 
 mostlyclean-generic:
@@ -671,9 +719,10 @@
 maintainer-clean-libtool mostlyclean-binPROGRAMS distclean-binPROGRAMS \
 clean-binPROGRAMS maintainer-clean-binPROGRAMS uninstall-binPROGRAMS \
 install-binPROGRAMS install-info-am uninstall-info mostlyclean-aminfo \
-distclean-aminfo clean-aminfo maintainer-clean-aminfo \
-uninstall-goopsdataDATA install-goopsdataDATA uninstall-modincludeDATA \
-install-modincludeDATA uninstall-subpkgdataDATA install-subpkgdataDATA \
+distclean-aminfo clean-aminfo maintainer-clean-aminfo install-man1 \
+uninstall-man1 install-man uninstall-man uninstall-goopsdataDATA \
+install-goopsdataDATA uninstall-modincludeDATA install-modincludeDATA \
+uninstall-subpkgdataDATA install-subpkgdataDATA \
 uninstall-includeHEADERS install-includeHEADERS tags mostlyclean-tags \
 distclean-tags clean-tags maintainer-clean-tags distdir \
 mostlyclean-depend distclean-depend clean-depend \
@@ -688,12 +737,13 @@
 install-exec-hook:
        $(mkinstalldirs) $(goopsdatadir)
        (. ./libgoopscore.la; \
+        relpath=`$(RELPATH) $(goopsdatadir) $(libdir)`; \
         test -z "$$dlname" \
         || test ! -r $(libdir)/$$dlname \
         || (cd $(goopsdatadir) \
             && rm -f libgoopscore.la $$dlname \
-            && $(LN_S) $(libdir)/libgoopscore.la \
-            && $(LN_S) $(libdir)/$$dlname))
+            && $(LN_S) $$relpath/libgoopscore.la \
+            && $(LN_S) $$relpath/$$dlname))
 
 dist-hook: goops.ps
        cp -p $(top_builddir)/goops.ps $(distdir)
Index: guile/guile-oops/configure
diff -u guile/guile-oops/configure:1.17 guile/guile-oops/configure:1.18
--- guile/guile-oops/configure:1.17     Sun Mar  4 18:32:58 2001
+++ guile/guile-oops/configure  Sun Mar  4 21:33:02 2001
@@ -1583,20 +1583,24 @@
   { echo "configure: error: Your Guile already has GOOPS built in.  You don't 
need this package." 1>&2; exit 1; }
 fi
 
+GUILEVERSION=`guile -c '(display (version))'`
+
+
+
 echo $ac_n "checking for two argument scm_mutex_init""... $ac_c" 1>&6
-echo "configure:1588: checking for two argument scm_mutex_init" >&5
+echo "configure:1592: checking for two argument scm_mutex_init" >&5
 if eval "test \"`echo '$''{'ac_cv_func_scm_mutex_init_two_args'+set}'`\" = 
set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1593 "configure"
+#line 1597 "configure"
 #include "confdefs.h"
 #include <libguile.h>
 int main() {
 scm_mutex_init (NULL, NULL);
 ; return 0; }
 EOF
-if { (eval echo configure:1600: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
+if { (eval echo configure:1604: \"$ac_compile\") 1>&5; (eval $ac_compile) 
2>&5; }; then
   rm -rf conftest*
   ac_cv_func_scm_mutex_init_two_args=yes
 else
@@ -1753,7 +1757,7 @@
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile versiondat.h" | sed "s/:[^ ]*//g"` conftest*; 
exit 1' 1 2 15
+trap 'rm -fr `echo "Makefile versiondat.h debian/libgoops5.links" | sed "s/:[^ 
]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1816,6 +1820,7 @@
 address@hidden@%$RANLIB%g
 address@hidden@%$LIBTOOL%g
 address@hidden@%$LIBQTHREADS%g
address@hidden@%$GUILEVERSION%g
 address@hidden@%$GOOPS_MAJOR_VERSION%g
 address@hidden@%$GOOPS_MINOR_VERSION%g
 address@hidden@%$GOOPS_VERSION%g
@@ -1865,7 +1870,7 @@
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile versiondat.h"}
+CONFIG_FILES=\${CONFIG_FILES-"Makefile versiondat.h debian/libgoops5.links"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
Index: guile/guile-oops/configure.in
diff -u guile/guile-oops/configure.in:1.17 guile/guile-oops/configure.in:1.18
--- guile/guile-oops/configure.in:1.17  Sun Mar  4 18:32:58 2001
+++ guile/guile-oops/configure.in       Sun Mar  4 21:33:02 2001
@@ -33,6 +33,10 @@
   AC_MSG_ERROR([Your Guile already has GOOPS built in.  You don't need this 
package.])
 fi
 
+GUILEVERSION=`guile -c '(display (version))'`
+
+AC_SUBST(GUILEVERSION)
+
 AC_CACHE_CHECK(for two argument scm_mutex_init,
 ac_cv_func_scm_mutex_init_two_args,
 AC_TRY_COMPILE([#include <libguile.h>],[scm_mutex_init (NULL, NULL);],
@@ -67,7 +71,7 @@
 
 AC_SUBST(LIBLOBJS)
 
-AC_OUTPUT(Makefile versiondat.h)
+AC_OUTPUT(Makefile versiondat.h debian/libgoops5.links)
 
 dnl Local Variables:
 dnl comment-start: "dnl "