diff options
| author | Matthieu Herrb <matthieu.herrb@laas.fr> | 2006-04-30 14:22:53 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu.herrb@laas.fr> | 2006-04-30 14:22:53 +0000 |
| commit | 05a5c96fcef9822ff3c0312427d2c2672f73b551 (patch) | |
| tree | bb863d9047fdc66af40d3278ae947dc849478006 | |
| parent | 0aa6a46099fb319c82da51b8a73566007ad5acbd (diff) | |
Define BITMAPDIR for the case where ${prefix} != /usrlibXmu-1_0_2XORG-7_1
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 8 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2006-04-30 Matthieu Herrb <matthieu.herrb@laas.fr> + + * src/Makefile.am + Define BITMAPDIR for the case where ${prefix} != /usr + 2006-04-26 Adam Jackson <ajax@freedesktop.org> * configure.ac: diff --git a/src/Makefile.am b/src/Makefile.am index 9ed5cfe..df49a20 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,11 @@ lib_LTLIBRARIES = libXmu.la libXmuu.la +BITMAP_DEFINES = -DBITMAPDIR=\"$(includedir)/X11/bitmaps\" + AM_CFLAGS = \ -I${top_srcdir}/include \ -I${top_srcdir}/include/X11/Xmu \ - $(XMU_CFLAGS) -D_BSD_SOURCE + $(XMU_CFLAGS) $(BITMAP_DEFINES) -D_BSD_SOURCE libXmu_la_LDFLAGS = -version-number 6:2:0 -no-undefined libXmuu_la_LDFLAGS = -version-number 1:0:0 -no-undefined |