public inbox for frysk-cvs@sourceware.org
help / color / mirror / Atom feed
* [SCM]  master: Install frysk/pkgdatadir/test-sysroot.
@ 2008-01-16 17:46 scox
  0 siblings, 0 replies; only message in thread
From: scox @ 2008-01-16 17:46 UTC (permalink / raw)
  To: frysk-cvs

The branch, master has been updated
       via  b411c4502c388f944b97dac30e1cf19e07c881af (commit)
      from  0443d3a51378ad5454ed4b04d12823380e7385cf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit b411c4502c388f944b97dac30e1cf19e07c881af
Author: Stan Cox <scox@redhat.com>
Date:   Wed Jan 16 12:40:47 2008 -0500

    Install frysk/pkgdatadir/test-sysroot.
    
    * Makefile.am (pkgdatadir/test-sysroot): Use make functions.
    (nobase_pkgdata_DATA): Define for installation of test-sysroot.
    (install-data-hook): Likewise.

-----------------------------------------------------------------------

Summary of changes:
 frysk-core/ChangeLog   |    6 ++++++
 frysk-core/Makefile.am |   27 +++++++++++++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

First 500 lines of diff:
diff --git a/frysk-core/ChangeLog b/frysk-core/ChangeLog
index ed8602c..ad1ca5d 100644
--- a/frysk-core/ChangeLog
+++ b/frysk-core/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-16  Stan Cox  <scox@redhat.com>
+
+	* Makefile.am (pkgdatadir/test-sysroot): Use make functions.
+	(nobase_pkgdata_DATA): Define for installation of test-sysroot.
+	(install-data-hook): Likewise.
+
 2008-01-15  Stan Cox  <scox@redhat.com>
 
 	* Makefile.am (pkgdatadir/test-sysroot): New.
diff --git a/frysk-core/Makefile.am b/frysk-core/Makefile.am
index b6102f1..465b6e3 100644
--- a/frysk-core/Makefile.am
+++ b/frysk-core/Makefile.am
@@ -1,6 +1,6 @@
 # This file is part of the program FRYSK.
 #
-# Copyright 2005, 2007, Red Hat Inc.
+# Copyright 2005, 2007, 2008, Red Hat Inc.
 #
 # FRYSK is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -110,22 +110,25 @@ frysk_pkglibdir_funit_symbols_stripped_SOURCES =
 frysk/pkglibdir/funit-symbols-stripped: frysk/pkglibdir/funit-symbols
 	strip -o $@ frysk/pkglibdir/funit-symbols
 
-pkgdata_DATA += frysk/pkgdatadir/test-sysroot/`pwd`/frysk/pkglibdir/funit-addresses
-frysk/pkgdatadir/test-sysroot/`pwd`/frysk/pkglibdir/funit-addresses: frysk/pkglibdir/funit-addresses
-	mkdir -p `pwd`/frysk/pkgdatadir/test-sysroot/`pwd`/frysk/pkglibdir
+nobase_pkgdata_DATA = frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses)
+frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses): frysk/pkglibdir/funit-addresses
+	mkdir -p $(abspath frysk/pkgdatadir/test-sysroot)/$(abspath frysk/pkglibdir)
 	cp -r $< $@
 
-pkgdata_DATA += frysk/pkgdatadir/test-sysroot/$(realpath $(srcdir))/frysk/pkglibdir/funit-addresses.c
-frysk/pkgdatadir/test-sysroot/$(realpath $(srcdir))/frysk/pkglibdir/funit-addresses.c: \
-frysk/pkgdatadir/test-sysroot/`pwd`/frysk/pkglibdir/funit-addresses
-	mkdir -p `pwd`/frysk/pkgdatadir/test-sysroot/$(realpath $(srcdir))/frysk/pkglibdir
-	cp $(realpath $(srcdir))/frysk/pkglibdir/funit-addresses.c $@
+nobase_pkgdata_DATA += frysk/pkgdatadir/test-sysroot/$(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c)
+frysk/pkgdatadir/test-sysroot/$(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c): \
+frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses)
+	mkdir -p $(abspath frysk/pkgdatadir/test-sysroot)/$(abspath $(srcdir)/frysk/pkglibdir)
+	cp $(abspath $(srcdir)/frysk/pkglibdir/funit-addresses.c) $@
 
-pkgdata_DATA += frysk/pkgdatadir/test-sysroot/usr/lib/debug/`pwd`/frysk/pkglibdir/funit-addresses.debug
-frysk/pkgdatadir/test-sysroot/usr/lib/debug/`pwd`/frysk/pkglibdir/funit-addresses.debug: frysk/pkgdatadir/test-sysroot/`pwd`/frysk/pkglibdir/funit-addresses
-	mkdir -p `pwd`/frysk/pkgdatadir/test-sysroot/usr/lib/debug/`pwd`/frysk/pkglibdir/
+nobase_pkgdata_DATA += frysk/pkgdatadir/test-sysroot/usr/lib/debug/$(abspath frysk/pkglibdir/funit-addresses.debug)
+frysk/pkgdatadir/test-sysroot/usr/lib/debug/$(abspath frysk/pkglibdir/funit-addresses.debug): frysk/pkgdatadir/test-sysroot/$(abspath frysk/pkglibdir/funit-addresses)
+	mkdir -p $(abspath frysk/pkgdatadir/test-sysroot/usr/lib/debug/)/$(abspath frysk/pkglibdir)
 	eu-strip --remove-comment -f $@ $<
 
+install-data-hook:
+	mv $(datarootdir)/frysk/frysk/pkgdatadir/test-sysroot $(datarootdir)
+
 if DO_ARCH32_TEST
 pkglib32_PROGRAMS += frysk/pkglibdir/arch32/funit-symbols-nodebug
 frysk_pkglibdir_arch32_funit_symbols_nodebug_SOURCES =


hooks/post-receive
--
frysk system monitor/debugger


^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2008-01-16 17:46 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-01-16 17:46 [SCM] master: Install frysk/pkgdatadir/test-sysroot scox

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).