projects
/
mes.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build: Resolve MODULEDIR confusion. Fixes mes installation.
[mes.git]
/
make
/
install.make
diff --git
a/make/install.make
b/make/install.make
index 7428ee2c455c399eb1295aa8d6f171340b6fd24e..5f391a4a913b666a0fac36bf30a71a4fbe3faf0e 100644
(file)
--- a/
make/install.make
+++ b/
make/install.make
@@
-31,8
+31,10
@@
DATADIR:=$(PREFIX)/share
DOCDIR:=$(DATADIR)/doc
endif
LIBDIR:=$(PREFIX)/lib
DOCDIR:=$(DATADIR)/doc
endif
LIBDIR:=$(PREFIX)/lib
-MODULEDIR:=$(PREFIX)/share/guile/site/$(GUILE_EFFECTIVE_VERSION)
+
GODIR:=$(LIBDIR)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache
GODIR:=$(LIBDIR)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache
+GUILEDIR:=$(PREFIX)/share/guile/site/$(GUILE_EFFECTIVE_VERSION)
+MODULEDIR:=$(DATADIR)/module
.tarball-version: tree-clean-p
echo $(COMMIT) > $@
.tarball-version: tree-clean-p
echo $(COMMIT) > $@
@@
-74,6
+76,7
@@
install: $(CLEAN) ChangeLog
-e 's,@DATADIR@,$(DATADIR)/,g' \
-e 's,@DOCDIR@,$(DOCDIR)/,g' \
-e 's,@GODIR@,$(GODIR)/,g' \
-e 's,@DATADIR@,$(DATADIR)/,g' \
-e 's,@DOCDIR@,$(DOCDIR)/,g' \
-e 's,@GODIR@,$(GODIR)/,g' \
+ -e 's,@GUILEDIR@,$(GUILEDIR)/,g' \
-e 's,@MODULEDIR@,$(MODULEDIR)/,g' \
-e 's,@PREFIX@,$(PREFIX)/,g' \
-e 's,@VERSION@,$(VERSION),g' \
-e 's,@MODULEDIR@,$(MODULEDIR)/,g' \
-e 's,@PREFIX@,$(PREFIX)/,g' \
-e 's,@VERSION@,$(VERSION),g' \
@@
-90,9
+93,9
@@
install: $(CLEAN) ChangeLog
$(GIT_ARCHIVE_HEAD) doc \
| tar -C $(DESTDIR)$(DOCDIR) --strip=1 -xf-
cp ChangeLog $(DESTDIR)$(DOCDIR)
$(GIT_ARCHIVE_HEAD) doc \
| tar -C $(DESTDIR)$(DOCDIR) --strip=1 -xf-
cp ChangeLog $(DESTDIR)$(DOCDIR)
- mkdir -p $(DESTDIR)$(
MODU
LEDIR)
+ mkdir -p $(DESTDIR)$(
GUI
LEDIR)
tar -cf- -C module $(INSTALL_SCM_FILES:module/%=%)\
tar -cf- -C module $(INSTALL_SCM_FILES:module/%=%)\
- | tar -C $(DESTDIR)$(
MODU
LEDIR) -xf-
+ | tar -C $(DESTDIR)$(
GUI
LEDIR) -xf-
mkdir -p $(DESTDIR)$(GODIR)
tar -cf- -C module $(INSTALL_GO_FILES:module/%=%)\
| tar -C $(DESTDIR)$(GODIR) -xf-
mkdir -p $(DESTDIR)$(GODIR)
tar -cf- -C module $(INSTALL_GO_FILES:module/%=%)\
| tar -C $(DESTDIR)$(GODIR) -xf-