diff options
author | tschwinge <tschwinge> | 2008-05-30 00:31:24 +0000 |
---|---|---|
committer | tschwinge <tschwinge> | 2008-05-30 00:31:24 +0000 |
commit | 5fcfa95d0edb1642920950def98d63c67b5cc6f5 (patch) | |
tree | eaa94d770b974fe582b89ad3ff53f826eb56e0df /libhurd-slab | |
parent | a7ecdb280f6760d81b655be491819747f822decd (diff) |
2008-05-29 Thomas Schwinge <tschwinge@gnu.org>
* headers.m4: Link files into `sysroot/include/' instead of `include/'.
Create symbolic link to package's library in `sysroot/lib/'.
* Makefile.am [ENABLE_TESTS]: Don't build package's library.
Diffstat (limited to 'libhurd-slab')
-rw-r--r-- | libhurd-slab/ChangeLog | 6 | ||||
-rw-r--r-- | libhurd-slab/Makefile.am | 2 | ||||
-rw-r--r-- | libhurd-slab/headers.m4 | 8 |
3 files changed, 15 insertions, 1 deletions
diff --git a/libhurd-slab/ChangeLog b/libhurd-slab/ChangeLog index 913e4a2..762459f 100644 --- a/libhurd-slab/ChangeLog +++ b/libhurd-slab/ChangeLog @@ -1,3 +1,9 @@ +2008-05-29 Thomas Schwinge <tschwinge@gnu.org> + + * headers.m4: Link files into `sysroot/include/' instead of `include/'. + Create symbolic link to package's library in `sysroot/lib/'. + * Makefile.am [ENABLE_TESTS]: Don't build package's library. + 2008-01-23 Neal H. Walfield <neal@gnu.org> * Makefile.am (AM_CPPFLAGS): Add -I$(LIBC)/include. diff --git a/libhurd-slab/Makefile.am b/libhurd-slab/Makefile.am index 68f2e87..3450879 100644 --- a/libhurd-slab/Makefile.am +++ b/libhurd-slab/Makefile.am @@ -19,7 +19,9 @@ # Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA # 02111-1307 USA. +if ! ENABLE_TESTS lib_LIBRARIES = libhurd-slab.a +endif includehurddir = $(includedir)/hurd includehurd_HEADERS = slab.h diff --git a/libhurd-slab/headers.m4 b/libhurd-slab/headers.m4 index ce6b382..86bdb5c 100644 --- a/libhurd-slab/headers.m4 +++ b/libhurd-slab/headers.m4 @@ -10,4 +10,10 @@ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -AC_CONFIG_LINKS([include/hurd/slab.h:libhurd-slab/slab.h]) +AC_CONFIG_LINKS([sysroot/include/hurd/slab.h:libhurd-slab/slab.h]) + +AC_CONFIG_COMMANDS_POST([ + mkdir -p sysroot/lib libhurd-slab && + ln -sf ../../libhurd-slab/libhurd-slab.a sysroot/lib/ && + touch libhurd-slab/libhurd-slab.a +]) |