diff options
-rw-r--r-- | README | 2 | ||||
-rwxr-xr-x | autogen.sh | 3 | ||||
-rw-r--r-- | configure.ac | 12 | ||||
-rw-r--r-- | libdrm/Makefile.am | 2 |
4 files changed, 6 insertions, 13 deletions
@@ -1,4 +1,4 @@ | |||
1 | By default, this will install into /usr/local. If you want to install this | 1 | By default, this will install into /usr/local. If you want to install this |
2 | libdrm to replace your system copy, say: | 2 | libdrm to replace your system copy, say: |
3 | 3 | ||
4 | ./autogen.sh --enable-system | 4 | ./configure --prefix=/usr --exec-prefix=/ |
diff --git a/autogen.sh b/autogen.sh new file mode 100755 index 00000000..b1376df5 --- /dev/null +++ b/autogen.sh | |||
@@ -0,0 +1,3 @@ | |||
1 | #! /bin/sh | ||
2 | autoreconf -v --install || exit 1 | ||
3 | ./configure --enable-maintainer-mode "$@" | ||
diff --git a/configure.ac b/configure.ac index 4fb505df..04bd8e7e 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -30,17 +30,7 @@ AC_PROG_CC | |||
30 | 30 | ||
31 | AC_HEADER_STDC | 31 | AC_HEADER_STDC |
32 | 32 | ||
33 | AC_ARG_ENABLE(system, AC_HELP_STRING([--enable-system], | 33 | pkgconfigdir=${libdir}/pkgconfig |
34 | [Configure to be the system libdrm]), | ||
35 | [SYSTEM=$enableval], [SYSTEM=no]) | ||
36 | AM_CONDITIONAL(SYSTEM, [test x$SYSTEM = xyes]) | ||
37 | if test x$SYSTEM = xyes; then | ||
38 | libdir=/lib | ||
39 | includedir=/usr/include | ||
40 | pkgconfigdir=/usr/lib/pkgconfig | ||
41 | else | ||
42 | pkgconfigdir=${libdir}/pkgconfig | ||
43 | fi | ||
44 | AC_SUBST(pkgconfigdir) | 34 | AC_SUBST(pkgconfigdir) |
45 | 35 | ||
46 | AC_OUTPUT([Makefile libdrm/Makefile libdrm.pc]) | 36 | AC_OUTPUT([Makefile libdrm/Makefile libdrm.pc]) |
diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am index f5fa69b2..62ba272a 100644 --- a/libdrm/Makefile.am +++ b/libdrm/Makefile.am | |||
@@ -19,7 +19,7 @@ | |||
19 | # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 19 | # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
20 | 20 | ||
21 | libdrm_la_LTLIBRARIES = libdrm.la | 21 | libdrm_la_LTLIBRARIES = libdrm.la |
22 | libdrm_ladir = /lib | 22 | libdrm_ladir = $(libdir) |
23 | libdrm_la_LDFLAGS = -version-number 1:0:0 -no-undefined | 23 | libdrm_la_LDFLAGS = -version-number 1:0:0 -no-undefined |
24 | 24 | ||
25 | AM_CFLAGS = -I$(top_srcdir)/shared-core | 25 | AM_CFLAGS = -I$(top_srcdir)/shared-core |