You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ns...@apache.org on 2008/06/07 20:26:21 UTC
svn commit: r664372 - in /incubator/couchdb/trunk: Makefile.am
bin/Makefile.am etc/Makefile.am etc/couchdb/Makefile.am share/Makefile.am
src/Makefile.am src/couchdb/Makefile.am src/mochiweb/Makefile.am
var/Makefile.am
Author: nslater
Date: Sat Jun 7 11:26:21 2008
New Revision: 664372
URL: http://svn.apache.org/viewvc?rev=664372&view=rev
Log:
removed old, broken, datarootdir hack
Modified:
incubator/couchdb/trunk/Makefile.am
incubator/couchdb/trunk/bin/Makefile.am
incubator/couchdb/trunk/etc/Makefile.am
incubator/couchdb/trunk/etc/couchdb/Makefile.am
incubator/couchdb/trunk/share/Makefile.am
incubator/couchdb/trunk/src/Makefile.am
incubator/couchdb/trunk/src/couchdb/Makefile.am
incubator/couchdb/trunk/src/mochiweb/Makefile.am
incubator/couchdb/trunk/var/Makefile.am
Modified: incubator/couchdb/trunk/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/Makefile.am?rev=664372&r1=664371&r2=664372&view=diff
==============================================================================
--- incubator/couchdb/trunk/Makefile.am (original)
+++ incubator/couchdb/trunk/Makefile.am Sat Jun 7 11:26:21 2008
@@ -10,8 +10,6 @@
## License for the specific language governing permissions and limitations
## under the License.
-datarootdir = @prefix@/share
-
SUBDIRS = bin etc src share var
pkgdoc_DATA = AUTHORS.gz BUGS.gz CHANGES.gz NEWS.gz README.gz THANKS.gz
Modified: incubator/couchdb/trunk/bin/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/bin/Makefile.am?rev=664372&r1=664371&r2=664372&view=diff
==============================================================================
--- incubator/couchdb/trunk/bin/Makefile.am (original)
+++ incubator/couchdb/trunk/bin/Makefile.am Sat Jun 7 11:26:21 2008
@@ -10,8 +10,6 @@
## License for the specific language governing permissions and limitations
## under the License.
-datarootdir = @prefix@/share
-
bin_SCRIPTS = couchdb couchjs
if HELP2MAN
Modified: incubator/couchdb/trunk/etc/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/etc/Makefile.am?rev=664372&r1=664371&r2=664372&view=diff
==============================================================================
--- incubator/couchdb/trunk/etc/Makefile.am (original)
+++ incubator/couchdb/trunk/etc/Makefile.am Sat Jun 7 11:26:21 2008
@@ -10,8 +10,6 @@
## License for the specific language governing permissions and limitations
## under the License.
-datarootdir = @prefix@/share
-
SUBDIRS = couchdb default init launchd logrotate.d
default_sysconf_data = logrotate.d/couchdb
Modified: incubator/couchdb/trunk/etc/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/etc/couchdb/Makefile.am?rev=664372&r1=664371&r2=664372&view=diff
==============================================================================
--- incubator/couchdb/trunk/etc/couchdb/Makefile.am (original)
+++ incubator/couchdb/trunk/etc/couchdb/Makefile.am Sat Jun 7 11:26:21 2008
@@ -10,8 +10,6 @@
## License for the specific language governing permissions and limitations
## under the License.
-datarootdir = @prefix@/share
-
pkgconf_DATA = couch.ini
CLEANFILES = $(pkgconf_DATA)
Modified: incubator/couchdb/trunk/share/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/share/Makefile.am?rev=664372&r1=664371&r2=664372&view=diff
==============================================================================
--- incubator/couchdb/trunk/share/Makefile.am (original)
+++ incubator/couchdb/trunk/share/Makefile.am Sat Jun 7 11:26:21 2008
@@ -10,8 +10,6 @@
## License for the specific language governing permissions and limitations
## under the License.
-datarootdir = @prefix@/share
-
nobase_dist_pkgdata_DATA = \
server/main.js \
www/browse/_compact_database.html \
Modified: incubator/couchdb/trunk/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/Makefile.am?rev=664372&r1=664371&r2=664372&view=diff
==============================================================================
--- incubator/couchdb/trunk/src/Makefile.am (original)
+++ incubator/couchdb/trunk/src/Makefile.am Sat Jun 7 11:26:21 2008
@@ -10,6 +10,4 @@
## License for the specific language governing permissions and limitations
## under the License.
-datarootdir = @prefix@/share
-
SUBDIRS = couchdb mochiweb
Modified: incubator/couchdb/trunk/src/couchdb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/couchdb/Makefile.am?rev=664372&r1=664371&r2=664372&view=diff
==============================================================================
--- incubator/couchdb/trunk/src/couchdb/Makefile.am (original)
+++ incubator/couchdb/trunk/src/couchdb/Makefile.am Sat Jun 7 11:26:21 2008
@@ -10,8 +10,6 @@
## License for the specific language governing permissions and limitations
## under the License.
-datarootdir = @prefix@/share
-
ICU_LOCAL_FLAGS = $(ICU_LOCAL_CFLAGS) $(ICU_LOCAL_LDFLAGS)
couchprivlibdir = $(erlanglibdir)/couch-$(version)/priv/lib
Modified: incubator/couchdb/trunk/src/mochiweb/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/src/mochiweb/Makefile.am?rev=664372&r1=664371&r2=664372&view=diff
==============================================================================
--- incubator/couchdb/trunk/src/mochiweb/Makefile.am (original)
+++ incubator/couchdb/trunk/src/mochiweb/Makefile.am Sat Jun 7 11:26:21 2008
@@ -10,8 +10,6 @@
## License for the specific language governing permissions and limitations under
## the License.
-datarootdir = @prefix@/share
-
mochiwebebindir = $(erlanglibdir)/mochiweb-r76/ebin
mochiweb_file_collection = \
Modified: incubator/couchdb/trunk/var/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/couchdb/trunk/var/Makefile.am?rev=664372&r1=664371&r2=664372&view=diff
==============================================================================
--- incubator/couchdb/trunk/var/Makefile.am (original)
+++ incubator/couchdb/trunk/var/Makefile.am Sat Jun 7 11:26:21 2008
@@ -10,8 +10,6 @@
## License for the specific language governing permissions and limitations
## under the License.
-datarootdir = @prefix@/share
-
install-data-hook:
if test ! "$(mkdir_p)" = ""; then \
$(mkdir_p) "$(DESTDIR)$(pkgstatelibdir)"; \