From 48e8e0ef72e03d16c2b8bdcc8e377ceefcf08e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20Betn=C3=A9r?= Date: Thu, 23 Mar 2006 10:38:11 +0000 Subject: [PATCH] Autoconf is supposed to make life easy, I guess that is only true if someone else sets it up for you. Here's my fumbly finger approach to get it right. --- admin-root/lib-js/Makefile.am | 2 +- admin-root/lib-js/script.aculo.us/Makefile.am | 2 +- configure.in | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin-root/lib-js/Makefile.am b/admin-root/lib-js/Makefile.am index 96a05418..619c2016 100644 --- a/admin-root/lib-js/Makefile.am +++ b/admin-root/lib-js/Makefile.am @@ -2,7 +2,7 @@ # SUBDIRS=script.aculo.us -jslibdir = ${pkgdatadir}/lib-js +jslibdir = ${pkgdatadir}/admin-root/lib-js jslib_DATA = prototype.js EXTRA_DIST = prototype.js diff --git a/admin-root/lib-js/script.aculo.us/Makefile.am b/admin-root/lib-js/script.aculo.us/Makefile.am index 1f500111..3ad2f2e2 100644 --- a/admin-root/lib-js/script.aculo.us/Makefile.am +++ b/admin-root/lib-js/script.aculo.us/Makefile.am @@ -1,6 +1,6 @@ # $Id: Makefile.am 712 2005-11-20 10:02:31Z rpedde $ # -scriptaculousdir = ${pkgdatadir}/script.aculo.us +scriptaculousdir = ${pkgdatadir}/admin-root/lib-js/script.aculo.us scriptaculous_DATA = builder.js controls.js dragdrop.js effects.js \ scriptaculous.js slider.js unittest.js diff --git a/configure.in b/configure.in index ff38806d..30840a4b 100644 --- a/configure.in +++ b/configure.in @@ -291,4 +291,4 @@ AC_CHECK_LIB(socket,socket,V_NETLIBS="-lsocket $V_NETLIBS",,) AC_SUBST(V_NETLIBS) -AC_OUTPUT(src/Makefile admin-root/Makefile contrib/Makefile debian/Makefile Makefile) +AC_OUTPUT(src/Makefile admin-root/Makefile admin-root/lib-js/Makefile admin-root/lib-js/script.aculo.us/Makefile contrib/Makefile debian/Makefile Makefile)