summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbringert <unknown>2004-06-23 13:23:25 +0000
committerbringert <unknown>2004-06-23 13:23:25 +0000
commitba9d7ba3e2e2a01052101676f04ed7dc200f2cf3 (patch)
tree4b9930a54dfe7b5f1e0b957c76d6e491ddaea151 /src
parente5315aa5fd12b57124f42123b4f981460258f578 (diff)
Do not use prefix inside the binary dist
Diffstat (limited to 'src')
-rw-r--r--src/Makefile5
-rw-r--r--src/Makefile.binary6
2 files changed, 5 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile
index 40ccec930..4fc1f2928 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -134,9 +134,10 @@ binary-dist:
./configure --host="$(host)" CPPFLAGS="`lib__readline -I` `lib__ncurses -I`" LDFLAGS="`lib__readline -l` `lib__ncurses -l`"
# make unix gfdoc jar
make gfdoc jar
- make prefix=$(BIN_DIST_DIR)/$(prefix) install
+ $(INSTALL) ../bin/gf util/gfdoc jgf
+ $(INSTALL) -m 0644 java/gf-java.jar
$(INSTALL) configure $(BIN_DIST_DIR)
- $(INSTALL) -m 0644 config.mk.in config.mk jgf.in $(BIN_DIST_DIR)
+ $(INSTALL) -m 0644 config.mk.in jgf.in $(BIN_DIST_DIR)
$(INSTALL) -m 0644 ../README ../LICENSE $(BIN_DIST_DIR)
$(INSTALL) -m 0644 INSTALL.binary $(BIN_DIST_DIR)/INSTALL
$(INSTALL) -m 0644 Makefile.binary $(BIN_DIST_DIR)/Makefile
diff --git a/src/Makefile.binary b/src/Makefile.binary
index 32ce409b6..c8d666cff 100644
--- a/src/Makefile.binary
+++ b/src/Makefile.binary
@@ -4,8 +4,6 @@ GF_LIB_DIR=$(libdir)/GF-$(PACKAGE_VERSION)
install:
$(INSTALL) -d $(bindir)
- $(INSTALL) ./$(bindir)/* $(bindir)
-# overwrite the old one with the newly configured one if there is one
- [ -f jgf ] && $(INSTALL) jgf $(bindir)
+ $(INSTALL) gf gfdoc jgf $(bindir)
$(INSTALL) -d $(GF_LIB_DIR)
- $(INSTALL) -m 0644 ./$(GF_LIB_DIR)/* $(GF_LIB_DIR)
+ $(INSTALL) -m 0644 gf-java.jar $(GF_LIB_DIR)