From 45a2fb4025c923c477f69a0301b3a5380b4e80e0 Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Sun, 9 Mar 2014 22:39:35 +0800
Subject: [PATCH] Externals - Fix prefix value (use DESTPATH)

---
 Externals/common_automake.mk               |  2 +-
 Externals/config.mk                        | 15 +++++++++------
 Externals/cross-compiler/Makefile          |  2 +-
 Externals/dropbear/Makefile                |  2 +-
 Externals/dropbear/patches/options.h.patch | 18 ++++++++++++++++--
 Externals/sdl12/Makefile                   |  2 +-
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/Externals/common_automake.mk b/Externals/common_automake.mk
index 8f0ba3c7..70b1978e 100644
--- a/Externals/common_automake.mk
+++ b/Externals/common_automake.mk
@@ -28,5 +28,5 @@ $(BDIR)/Makefile: _patch $(CONFIGSCRIPT) ../common_automake.mk Makefile
 
 _build: $(BDIR)/Makefile
 	PATH=$(PATH) make $(BTARGETS) -C $(BDIR)
-	PATH=$(PATH) make $(ITARGETS) -C $(BDIR)
+	PATH=$(PATH) make DESTDIR=$(OUTDIR) $(ITARGETS) -C $(BDIR)
 
diff --git a/Externals/config.mk b/Externals/config.mk
index 26b9efb8..3d7913b5 100644
--- a/Externals/config.mk
+++ b/Externals/config.mk
@@ -11,14 +11,17 @@ else
  $(error No BFD translation for $(ARCH) in Externals/config.mk)
 endif
 
-#PREFIX=$(ACESSDIR)/Externals/Output
-#EPREFIX=$(ACESSDIR)/Externals/Output/$(BFD)
-PREFIX=$(ACESSDIR)/Externals/Output/$(ARCH)
-EPREFIX=$(PREFIX)
+OUTDIR=$(ACESSDIR)/Externals/Output/$(ARCH)
+BUILD_OUTDIR=$(OUTDIR)-BUILD
 SYSROOT=$(ACESSDIR)/Externals/Output/sysroot-$(BFD)
-HOST=$(BFD)-pc-acess2
-PATH:=$(PREFIX)-BUILD/bin:$(PATH)
+
+PATH:=$(BUILD_OUTDIR)/bin:$(PATH)
 INCLUDE_DIR=$(SYSROOT)/usr/include
 
+# Runtime Options
+PREFIX=/Acess/usr/
+EPREFIX=$(PREFIX)
+HOST=$(BFD)-pc-acess2
+
 PARLEVEL ?= 1
 
diff --git a/Externals/cross-compiler/Makefile b/Externals/cross-compiler/Makefile
index 30ebe348..9dde5d88 100644
--- a/Externals/cross-compiler/Makefile
+++ b/Externals/cross-compiler/Makefile
@@ -15,7 +15,7 @@ TARGET=$(HOST)
 GCC_TARGETS := gcc target-libgcc
 # target-libstdc++-v3 
 
-PREFIX := $(PREFIX)-BUILD
+PREFIX := $(OUTDIR)-BUILD
 BDIR_GCC := build-$(ARCH)/gcc
 BDIR_BINUTILS := build-$(ARCH)/binutils
 
diff --git a/Externals/dropbear/Makefile b/Externals/dropbear/Makefile
index 270815c3..d9f59e83 100644
--- a/Externals/dropbear/Makefile
+++ b/Externals/dropbear/Makefile
@@ -8,7 +8,7 @@ TARBALL_PATTERN := dropbear-*.tar.bz2
 TARBALL_TO_DIR_L := %.tar.bz2
 TARBALL_TO_DIR_R := %
 PATCHES := options.h config.sub
-CONFIGURE_ARGS = --with-zlib=$(PREFIX) --disable-utmp --disable-wtmp --disable-lastlog
+CONFIGURE_ARGS = --with-zlib=$(OUTDIR) --disable-utmp --disable-wtmp --disable-lastlog DSS_PRIV_FILENAME=/Acess/Conf/dropbear/host_key_dss RSA_PRIV_FILENAME=/Acess/Conf/dropbear/host_key_rsa MOTD_FILENAME=/Acess/Conf/dropbear/motd
 CONFIGURE_ENV = LIBS=-lpsocket
 BTARGETS = dbclient dropbear
 ITARGETS = inst_dbclient inst_dropbear
diff --git a/Externals/dropbear/patches/options.h.patch b/Externals/dropbear/patches/options.h.patch
index 9ff95cb3..0022eb9e 100644
--- a/Externals/dropbear/patches/options.h.patch
+++ b/Externals/dropbear/patches/options.h.patch
@@ -1,10 +1,24 @@
 --- options.h
 +++ options.h
-@@ -54,2 +54,2 @@
+@@ -23,6 +23,6 @@
+ #ifndef DSS_PRIV_FILENAME
+-#define DSS_PRIV_FILENAME "/etc/dropbear/dropbear_dss_host_key"
++#define DSS_PRIV_FILENAME "/Acess/Conf/dropbear/host_key_dss"
+ #endif
+ #ifndef RSA_PRIV_FILENAME
+-#define RSA_PRIV_FILENAME "/etc/dropbear/dropbear_rsa_host_key"
++#define RSA_PRIV_FILENAME "/Acess/Conf/dropbear/host_key_rsa"
+ #endif
+@@ -55,2 +55,2 @@
  /* Enable X11 Forwarding - server only */
 -#define ENABLE_X11FWD
 +//#define ENABLE_X11FWD
-@@ -217,2 +217,2 @@
+@@ -163,3 +163,3 @@
+ #ifndef MOTD_FILENAME
+-#define MOTD_FILENAME "/etc/motd"
++#define MOTD_FILENAME "/Acess/Conf/dropbear/motd"
+ #endif
+@@ -216,2 +216,2 @@
   * rsa/dss key generation */
 -#define DROPBEAR_URANDOM_DEV "/dev/urandom"
 +#define DROPBEAR_URANDOM_DEV "/Devices/frandom"
diff --git a/Externals/sdl12/Makefile b/Externals/sdl12/Makefile
index 30c17db7..c247e60c 100644
--- a/Externals/sdl12/Makefile
+++ b/Externals/sdl12/Makefile
@@ -9,7 +9,7 @@ TARBALL_TO_DIR_L := %.tar.gz
 TARBALL_TO_DIR_R := %
 PATCHES := configure build-scripts/config.sub
 PATCHES += src/video/acess/ptyvideo.c src/video/SDL_video.c src/video/SDL_sysvideo.h
-CONFIGURE_ARGS = --includedir=$(INCLUDEDIR) --bindir=$(PREFIX)-BUILD/bin/
+CONFIGURE_ARGS = --includedir=$(INCLUDEDIR) --bindir=$(OUTDIR)-BUILD/bin/
 #AUTORECONF = yes
 
 include ../common_automake.mk
-- 
2.20.1