distcheck fixes

diff --git a/README b/README
index c94dce5..b466dd8 100644 (file)
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
 By default, this will install into /usr/local.  If you want to install this
 libdrm to replace your system copy, say:
 
-./autogen.sh --enable-system
+./configure --prefix=/usr --exec-prefix=/

diff --git a/autogen.sh b/autogen.sh
new file mode 100755 (executable)
index 0000000..b1376df
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+autoreconf -v --install || exit 1
+./configure --enable-maintainer-mode "$@"

diff --git a/configure.ac b/configure.ac
index 4fb505d..04bd8e7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -30,17 +30,7 @@ AC_PROG_CC
 
 AC_HEADER_STDC
 
-AC_ARG_ENABLE(system, AC_HELP_STRING([--enable-system],
-              [Configure to be the system libdrm]),
-              [SYSTEM=$enableval], [SYSTEM=no])
-AM_CONDITIONAL(SYSTEM, [test x$SYSTEM = xyes])
-if test x$SYSTEM = xyes; then
-    libdir=/lib
-    includedir=/usr/include
-    pkgconfigdir=/usr/lib/pkgconfig
-else
-    pkgconfigdir=${libdir}/pkgconfig
-fi
+pkgconfigdir=${libdir}/pkgconfig
 AC_SUBST(pkgconfigdir)
 
 AC_OUTPUT([Makefile libdrm/Makefile libdrm.pc])

diff --git a/libdrm/Makefile.am b/libdrm/Makefile.am
index f5fa69b..62ba272 100644 (file)
--- a/libdrm/Makefile.am
+++ b/libdrm/Makefile.am
@@ -19,7 +19,7 @@
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 libdrm_la_LTLIBRARIES = libdrm.la
-libdrm_ladir = /lib
+libdrm_ladir = $(libdir)
 libdrm_la_LDFLAGS = -version-number 1:0:0 -no-undefined
 
 AM_CFLAGS = -I$(top_srcdir)/shared-core