OSSP CVS Repository

ossp - Check-in [4744]
Not logged in 		[Honeypot]  [Browse]  [Home]  [Login]  [Reports] 
[Search]  [Ticket]  [Timeline] 
  [Patchset]  [Tagging/Branching] 

Check-in Number: 4744
Date: 2004-Oct-15 20:22:31 (local)
2004-Oct-15 18:22:31 (UTC)
User:rse
Branch:
Comment: Support configuring/building/installing from an arbitrary directory via srcdir/top_srcdir/VPATH.

Submitted by: David Lee <t.d.lee@durham.ac.uk>

Tickets:
Inspections:
Files:
ossp-pkg/uuid/ChangeLog      1.53 -> 1.54     4 inserted, 0 deleted
ossp-pkg/uuid/Makefile.in      1.19 -> 1.20     25 inserted, 21 deleted
ossp-pkg/uuid/configure.ac      1.7 -> 1.8     4 inserted, 3 deleted
ossp-pkg/uuid/ChangeLog 1.53 -> 1.54 

--- ChangeLog    2004/10/15 18:16:52     1.53
+++ ChangeLog    2004/10/15 18:22:31     1.54
@@ -13,6 +13,10 @@
 
   Changes between 1.0.2 and 1.0.3 (12-Sep-2004 to xx-xxx-2004)
 
+   o Support configuring/building/installing from an arbitrary
+     directory via srcdir/top_srcdir/VPATH.
+     [David Lee <t.d.lee@durham.ac.uk>, Ralf S. Engelschall]
+
    o Upgrade build environment to GNU libtool 1.5.10.
      [Ralf S. Engelschall]

ossp-pkg/uuid/Makefile.in 1.19 -> 1.20 

--- Makefile.in  2004/02/13 21:10:35     1.19
+++ Makefile.in  2004/10/15 18:22:31     1.20
@@ -29,6 +29,10 @@
 
 @SET_MAKE@
 
+srcdir      = @srcdir@
+top_srcdir  = @top_srcdir@
+VPATH       = @srcdir@
+
 DESTDIR     =
 prefix      = @prefix@
 exec_prefix = @exec_prefix@
@@ -38,14 +42,14 @@
 mandir      = @mandir@
 
 CC          = @CC@
-CPPFLAGS    = @CPPFLAGS@
+CPPFLAGS    = -I. -I$(srcdir) @CPPFLAGS@
 CFLAGS      = @DEFS@ @CFLAGS@
 LDFLAGS     = @LDFLAGS@
 LIBS        = @LIBS@
 RM          = rm -f
 CP          = cp
 RMDIR       = rmdir
-SHTOOL      = ./shtool
+SHTOOL      = $(top_srcdir)/shtool
 LIBTOOL     = ./libtool
 TRUE        = true
 POD2MAN     = pod2man
@@ -98,26 +102,26 @@
 
 man: uuid.3 uuid-config.1 uuid.1
 uuid.3: uuid.pod
-        V1=`$(SHTOOL) version -l txt -d short VERSION`; \
-        V2=`$(SHTOOL) version -l txt -d long VERSION`; \
-        D=`$(SHTOOL) version -l txt -d long VERSION | sed -e 's;.*(;;' -e 's;).*;;'`; \
+        V1=`$(SHTOOL) version -l txt -d short $(top_srcdir)/VERSION`; \
+        V2=`$(SHTOOL) version -l txt -d long $(top_srcdir)/VERSION`; \
+        D=`$(SHTOOL) version -l txt -d long $(top_srcdir)/VERSION | sed -e 's;.*(;;' -e 's;).*;;'`; \
         $(POD2MAN) --quotes=none \
                    --section=3 --center="Universally Unique Identifier" \
-                   --release="$$D" --date="OSSP uuid $$V1" uuid.pod | \
+                   --release="$$D" --date="OSSP uuid $$V1" $(srcdir)/uuid.pod | \
         sed -e "s;UUID_VERSION_STR;$$V2;" >uuid.3
 uuid-config.1: uuid-config.pod
-        V1=`$(SHTOOL) version -l txt -d short VERSION`; \
-        V2=`$(SHTOOL) version -l txt -d long VERSION`; \
-        D=`$(SHTOOL) version -l txt -d long VERSION | sed -e 's;.*(;;' -e 's;).*;;'`; \
+        V1=`$(SHTOOL) version -l txt -d short $(top_srcdir)/VERSION`; \
+        V2=`$(SHTOOL) version -l txt -d long $(top_srcdir)/VERSION`; \
+        D=`$(SHTOOL) version -l txt -d long $(top_srcdir)/VERSION | sed -e 's;.*(;;' -e 's;).*;;'`; \
         $(POD2MAN) --quotes=none \
                    --section=3 --center="Universally Unique Identifier" \
-                   --release="$$D" --date="OSSP uuid $$V1" uuid-config.pod | \
+                   --release="$$D" --date="OSSP uuid $$V1" $(srcdir)/uuid-config.pod | \
         sed -e "s;UUID_VERSION_STR;$$V2;" >uuid-config.1
 uuid.1: uuid_cli.pod
-        V1=`$(SHTOOL) version -l txt -d short VERSION`; \
-        V2=`$(SHTOOL) version -l txt -d long VERSION`; \
-        D=`$(SHTOOL) version -l txt -d long VERSION | sed -e 's;.*(;;' -e 's;).*;;'`; \
-        $(CP) uuid_cli.pod /tmp/uuid.pod; \
+        V1=`$(SHTOOL) version -l txt -d short $(top_srcdir)/VERSION`; \
+        V2=`$(SHTOOL) version -l txt -d long $(top_srcdir)/VERSION`; \
+        D=`$(SHTOOL) version -l txt -d long $(top_srcdir)/VERSION | sed -e 's;.*(;;' -e 's;).*;;'`; \
+        $(CP) $(srcdir)/uuid_cli.pod /tmp/uuid.pod; \
         $(POD2MAN) --quotes=none \
                    --section=1 --center="Universally Unique Identifier" \
                    --release="$$D" --date="OSSP uuid $$V1" /tmp/uuid.pod | \
@@ -150,20 +154,20 @@
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libdir)
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3
         $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
-        $(SHTOOL) install -c -m 755 uuid-config $(DESTDIR)$(bindir)/
-        $(SHTOOL) install -c -m 644 uuid-config.1 $(DESTDIR)$(mandir)/man1/
-        $(SHTOOL) install -c -m 644 uuid.h $(DESTDIR)$(includedir)/
+        $(SHTOOL) install -c -m 755 ./uuid-config $(DESTDIR)$(bindir)/
+        $(SHTOOL) install -c -m 644 $(srcdir)/uuid-config.1 $(DESTDIR)$(mandir)/man1/
+        $(SHTOOL) install -c -m 644 ./uuid.h $(DESTDIR)$(includedir)/
         -@if [ ".$(WITH_DCE)" = .yes ]; then \
-            echo "$(SHTOOL) install -c -m 644 uuid_dce.h $(DESTDIR)$(includedir)/"; \
-            $(SHTOOL) install -c -m 644 uuid_dce.h $(DESTDIR)$(includedir)/; \
+            echo "$(SHTOOL) install -c -m 644 $(srcdir)/uuid_dce.h $(DESTDIR)$(includedir)/"; \
+            $(SHTOOL) install -c -m 644 $(srcdir)/uuid_dce.h $(DESTDIR)$(includedir)/; \
         fi
-        $(SHTOOL) install -c -m 644 uuid.3 $(DESTDIR)$(mandir)/man3/
+        $(SHTOOL) install -c -m 644 $(srcdir)/uuid.3 $(DESTDIR)$(mandir)/man3/
         @$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libuuid.la $(DESTDIR)$(libdir)/
         -@if [ ".$(WITH_DCE)" = .yes ]; then \
             $(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 libuuid_dce.la $(DESTDIR)$(libdir)/; \
         fi
         @$(LIBTOOL) --mode=install $(SHTOOL) install -c -s -m 755 uuid $(DESTDIR)$(bindir)/
-        $(SHTOOL) install -c -m 644 uuid.1 $(DESTDIR)$(mandir)/man1/
+        $(SHTOOL) install -c -m 644 $(srcdir)/uuid.1 $(DESTDIR)$(mandir)/man1/
 
 uninstall:
         -$(RM) $(DESTDIR)$(mandir)/man1/uuid.1

ossp-pkg/uuid/configure.ac 1.7 -> 1.8 

--- configure.ac 2004/10/15 18:17:45     1.7
+++ configure.ac 2004/10/15 18:22:31     1.8
@@ -29,9 +29,10 @@
 
 AC_PREREQ(2.53)
 AC_INIT
-UUID_VERSION_STR=`./shtool version -l c -d long uuid_vers.h`
-UUID_VERSION_HEX=`./shtool version -l c -d hex  uuid_vers.h`
-./shtool echo -e "Configuring %BOSSP uuid%b (Universally Unique Identifier), version %B${UUID_VERSION_STR}%b"
+UUID_VERSION_STR=`$ac_confdir/shtool version -l c -d long uuid_vers.h`
+UUID_VERSION_HEX=`$ac_confdir/shtool version -l c -d hex  uuid_vers.h`
+$ac_confdir/shtool echo -e \
+    "Configuring %BOSSP uuid%b (Universally Unique Identifier), version %B${UUID_VERSION_STR}%b"
 AC_SUBST(UUID_VERSION_STR)
 AC_SUBST(UUID_VERSION_HEX)

CVSTrac 2.0.1