diff options
| author | Adam Jackson <ajax@nwnk.net> | 2005-07-13 00:13:12 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2005-07-13 00:13:12 +0000 |
| commit | 5a5478de7ab4ee2eef0308d8b4ce5c53222cd55e (patch) | |
| tree | 1536bbdf663fee1c450f88bd3fe7fbb7da2b3fa7 | |
| parent | 7130662aa0c476a56a4a053c6dda19bc3a91060a (diff) | |
distcheck fixes
| -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 @@ 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 index 00000000..b1376df5 --- /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 4fb505df..04bd8e7e 100644 --- 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 f5fa69b2..62ba272a 100644 --- 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 |