diff options
author | Noah Slater <nslater@apache.org> | 2008-06-07 18:26:21 +0000 |
---|---|---|
committer | Noah Slater <nslater@apache.org> | 2008-06-07 18:26:21 +0000 |
commit | b01764e9f4f2784c1e280ae5e29f95e80fbad133 (patch) | |
tree | 1417f72fb4d40219ad72f219ede3398f2b418d36 | |
parent | 4606b26091963d26e15095199170e1e74abf7e62 (diff) |
removed old, broken, datarootdir hack
git-svn-id: https://svn.apache.org/repos/asf/incubator/couchdb/trunk@664372 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | bin/Makefile.am | 2 | ||||
-rw-r--r-- | etc/Makefile.am | 2 | ||||
-rw-r--r-- | etc/couchdb/Makefile.am | 2 | ||||
-rw-r--r-- | share/Makefile.am | 2 | ||||
-rw-r--r-- | src/Makefile.am | 2 | ||||
-rw-r--r-- | src/couchdb/Makefile.am | 2 | ||||
-rw-r--r-- | src/mochiweb/Makefile.am | 2 | ||||
-rw-r--r-- | var/Makefile.am | 2 |
9 files changed, 0 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index 5c2a42ff..c172be79 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/bin/Makefile.am b/bin/Makefile.am index cbe69dbc..437f64fc 100644 --- a/bin/Makefile.am +++ b/bin/Makefile.am @@ -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 diff --git a/etc/Makefile.am b/etc/Makefile.am index e7373320..039ceb44 100644 --- a/etc/Makefile.am +++ b/etc/Makefile.am @@ -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 diff --git a/etc/couchdb/Makefile.am b/etc/couchdb/Makefile.am index ed0d2faa..8bb80b4a 100644 --- a/etc/couchdb/Makefile.am +++ b/etc/couchdb/Makefile.am @@ -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) diff --git a/share/Makefile.am b/share/Makefile.am index b31564ab..235af541 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -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 \ diff --git a/src/Makefile.am b/src/Makefile.am index f1bc29d1..f656a6d0 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,6 +10,4 @@ ## License for the specific language governing permissions and limitations ## under the License. -datarootdir = @prefix@/share - SUBDIRS = couchdb mochiweb diff --git a/src/couchdb/Makefile.am b/src/couchdb/Makefile.am index 92cdc0b2..283eb4bb 100644 --- a/src/couchdb/Makefile.am +++ b/src/couchdb/Makefile.am @@ -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 diff --git a/src/mochiweb/Makefile.am b/src/mochiweb/Makefile.am index 7dde7497..ea1d8f07 100644 --- a/src/mochiweb/Makefile.am +++ b/src/mochiweb/Makefile.am @@ -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 = \ diff --git a/var/Makefile.am b/var/Makefile.am index 4b112193..413ef7d2 100644 --- a/var/Makefile.am +++ b/var/Makefile.am @@ -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)"; \ |