aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Jackson2005-07-12 19:13:12 -0500
committerAdam Jackson2005-07-12 19:13:12 -0500
commit5a5478de7ab4ee2eef0308d8b4ce5c53222cd55e (patch)
tree1536bbdf663fee1c450f88bd3fe7fbb7da2b3fa7
parent7130662aa0c476a56a4a053c6dda19bc3a91060a (diff)
downloadexternal-libgbm-5a5478de7ab4ee2eef0308d8b4ce5c53222cd55e.tar.gz
external-libgbm-5a5478de7ab4ee2eef0308d8b4ce5c53222cd55e.tar.xz
external-libgbm-5a5478de7ab4ee2eef0308d8b4ce5c53222cd55e.zip
distcheck fixes
-rw-r--r--README2
-rwxr-xr-xautogen.sh3
-rw-r--r--configure.ac12
-rw-r--r--libdrm/Makefile.am2
4 files changed, 6 insertions, 13 deletions
diff --git a/README b/README
index c94dce5f..b466dd88 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
1By default, this will install into /usr/local. If you want to install this 1By default, this will install into /usr/local. If you want to install this
2libdrm to replace your system copy, say: 2libdrm 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
2autoreconf -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
31AC_HEADER_STDC 31AC_HEADER_STDC
32 32
33AC_ARG_ENABLE(system, AC_HELP_STRING([--enable-system], 33pkgconfigdir=${libdir}/pkgconfig
34 [Configure to be the system libdrm]),
35 [SYSTEM=$enableval], [SYSTEM=no])
36AM_CONDITIONAL(SYSTEM, [test x$SYSTEM = xyes])
37if test x$SYSTEM = xyes; then
38 libdir=/lib
39 includedir=/usr/include
40 pkgconfigdir=/usr/lib/pkgconfig
41else
42 pkgconfigdir=${libdir}/pkgconfig
43fi
44AC_SUBST(pkgconfigdir) 34AC_SUBST(pkgconfigdir)
45 35
46AC_OUTPUT([Makefile libdrm/Makefile libdrm.pc]) 36AC_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
21libdrm_la_LTLIBRARIES = libdrm.la 21libdrm_la_LTLIBRARIES = libdrm.la
22libdrm_ladir = /lib 22libdrm_ladir = $(libdir)
23libdrm_la_LDFLAGS = -version-number 1:0:0 -no-undefined 23libdrm_la_LDFLAGS = -version-number 1:0:0 -no-undefined
24 24
25AM_CFLAGS = -I$(top_srcdir)/shared-core 25AM_CFLAGS = -I$(top_srcdir)/shared-core