Revert "buildsystem, ide, tarball; moved some variable definitions from Makefile...

This reverts commit c4a9091be3541f003752243af9e93aae237e76c2.

This was breaking TARGET_ARCH awareness for DESTDIR on Windows

diff --git a/Makefile b/Makefile
index 38e6fc3..596ed56 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,19 +3,21 @@ ifneq "$V" "1"
 .SILENT:
 endif
 
-LIBVER := .0.44
-
 include crossplatform.mk
 include default.cf
 
 ifdef BSD_HOST
+INSTALL_FLAGS :=
 CPFLAGS := -pRf
 else
+INSTALL_FLAGS := -D
 CPFLAGS := -dpRf
 endif
 
 XBOOT := $(if $(CROSS_TARGET),GCC_PREFIX= TARGET_PLATFORM=$(HOST_PLATFORM) PLATFORM=$(HOST_PLATFORM),)
 
+LIBVER := .0.44
+
 ifdef WINDOWS_HOST
 HOST_SOV := $(HOST_SO)
 else
@@ -24,10 +26,50 @@ endif
 
 ifdef WINDOWS_TARGET
 
+SOV := $(SO)
+
+ifndef DESTDIR
+
+ifeq "$(TARGET_ARCH)" "x86_64"
+   ifneq "$(wildcard $(SystemDrive)/Program\ Files )" ""
+      export DESTDIR=$(SystemDrive)/Program Files/Ecere SDK
+   else
+      export DESTDIR=$(SystemDrive)/Ecere SDK
+   endif
+else
+   ifdef ProgramFiles(x86)
+      export DESTDIR=${ProgramFiles(x86)}/Ecere SDK
+   else
+      ifdef ProgramFiles
+         export DESTDIR=$(ProgramFiles)/Ecere SDK
+      else
+         export DESTDIR=$(SystemDrive)/Ecere SDK
+      endif
+   endif
+endif
+
+endif # DESTDIR
+
+export prefix=
+
 ifndef DOCDIR
 export DOCDIR=$(DESTDIR)$(prefix)/doc
 endif
 
+ifndef BINDIR
+export BINDIR=$(DESTDIR)$(prefix)/bin
+endif
+
+ifndef LIBDIR
+export LIBDIR=$(BINDIR)
+endif
+export DESTLIBDIR=$(LIBDIR)
+
+ifndef SLIBDIR
+export SLIBDIR=$(DESTDIR)$(prefix)/lib
+endif
+export DESTSLIBDIR=$(SLIBDIR)
+
 ifndef SAMPLESDIR
 export SAMPLESDIR=$(DESTDIR)$(prefix)/samples
 endif
@@ -36,8 +78,24 @@ ifndef EXTRASDIR
 export EXTRASDIR=$(DESTDIR)$(prefix)/extras
 endif
 
+
 else # WINDOWS_TARGET
 
+ifdef OSX_TARGET
+# TODO: OSX soname
+SOV := $(SO)
+else
+SOV := $(SO)$(LIBVER)
+endif
+
+ifndef DESTDIR
+export DESTDIR=
+endif
+
+ifndef prefix
+export prefix=/usr
+endif
+
 ifndef DOCDIR
 export DOCDIR=$(DESTDIR)$(prefix)/share/ecere/doc
 endif
@@ -46,9 +104,37 @@ ifndef MANDIR
 export MANDIR=$(DESTDIR)$(prefix)/share/man/
 endif
 
+ifndef BINDIR
+export BINDIR=$(DESTDIR)$(prefix)/bin
+endif
+
+ifdef LIBDIR
+ export PREFIXLIBDIR=$(LIBDIR)
+else
+ export PREFIXLIBDIR=$(prefix)/lib/$(TARGET_ARCH)
+
+ ifeq "$(wildcard $(prefix)/lib/$(TARGET_ARCH) )" ""
+  export PREFIXLIBDIR=$(prefix)/lib
+
+  ifeq "$(TARGET_ARCH)" "i386-linux-gnu"
+   ifneq "$(wildcard $(prefix)/lib32 )" ""
+    export PREFIXLIBDIR=$(prefix)/lib32
+   endif
+  endif
+
+ endif
+endif
+
 export CPPFLAGS
 CPPFLAGS += -DDEB_HOST_MULTIARCH=\"$(call escspace,$(PREFIXLIBDIR))\"
 
+DESTLIBDIR := $(DESTDIR)$(PREFIXLIBDIR)
+ifdef SLIBDIR
+DESTSLIBDIR := $(DESTDIR)$(SLIBDIR)
+else
+DESTSLIBDIR := $(DESTLIBDIR)
+endif
+
 ifndef SAMPLESDIR
 export SAMPLESDIR=$(DESTDIR)$(prefix)/share/ecere/samples
 endif
@@ -57,8 +143,8 @@ ifndef EXTRASDIR
 export EXTRASDIR=$(DESTDIR)$(prefix)/share/ecere/extras
 endif
 
-endif # WINDOWS_TARGET
 
+endif
 
 OBJDIR := obj$(OBJALT)/
 OBJBINDIR := $(OBJDIR)$(PLATFORM)$(COMPILER_SUFFIX)$(DEBUG_SUFFIX)/bin/

diff --git a/crossplatform.mk b/crossplatform.mk
index e64c76f..a53be93 100644 (file)
--- a/crossplatform.mk
+++ b/crossplatform.mk
@@ -284,108 +284,3 @@ ifdef WINDOWS_TARGET
   OPENSSL_BIN_DIR = .
  endif
 endif
-
-# INSTALL_FLAGS
-ifdef BSD_HOST
-INSTALL_FLAGS :=
-else
-INSTALL_FLAGS := -D
-endif
-
-# DESTDIR
-ifdef WINDOWS_TARGET
-
-SOV := $(SO)
-
-ifndef DESTDIR
-
-ifeq "$(TARGET_ARCH)" "x86_64"
-   ifneq "$(wildcard $(SystemDrive)/Program\ Files )" ""
-      export DESTDIR=$(SystemDrive)/Program Files/Ecere SDK
-   else
-      export DESTDIR=$(SystemDrive)/Ecere SDK
-   endif
-else
-   ifdef ProgramFiles(x86)
-      export DESTDIR=${ProgramFiles(x86)}/Ecere SDK
-   else
-      ifdef ProgramFiles
-         export DESTDIR=$(ProgramFiles)/Ecere SDK
-      else
-         export DESTDIR=$(SystemDrive)/Ecere SDK
-      endif
-   endif
-endif
-
-endif # DESTDIR
-
-export prefix=
-
-ifndef BINDIR
-export BINDIR=$(DESTDIR)$(prefix)/bin
-endif
-
-ifndef LIBDIR
-export LIBDIR=$(BINDIR)
-endif
-export DESTLIBDIR=$(LIBDIR)
-
-ifndef SLIBDIR
-export SLIBDIR=$(DESTDIR)$(prefix)/lib
-endif
-export DESTSLIBDIR=$(SLIBDIR)
-
-else # WINDOWS_TARGET
-
-ifdef OSX_TARGET
-# TODO: OSX soname
-SOV := $(SO)
-else
-ifdef LIBVER
-SOV := $(SO)$(LIBVER)
-else
-ifdef VERSION
-SOV := $(SO).$(VERSION)
-else
-SOV := $(SO)
-endif
-endif
-endif
-
-ifndef DESTDIR
-export DESTDIR=
-endif
-
-ifndef prefix
-export prefix=/usr
-endif
-
-ifndef BINDIR
-export BINDIR=$(DESTDIR)$(prefix)/bin
-endif
-
-ifdef LIBDIR
- export PREFIXLIBDIR=$(LIBDIR)
-else
- export PREFIXLIBDIR=$(prefix)/lib/$(TARGET_ARCH)
-
- ifeq "$(wildcard $(prefix)/lib/$(TARGET_ARCH) )" ""
-  export PREFIXLIBDIR=$(prefix)/lib
-
-  ifeq "$(TARGET_ARCH)" "i386-linux-gnu"
-   ifneq "$(wildcard $(prefix)/lib32 )" ""
-    export PREFIXLIBDIR=$(prefix)/lib32
-   endif
-  endif
-
- endif
-endif
-
-DESTLIBDIR := $(DESTDIR)$(PREFIXLIBDIR)
-ifdef SLIBDIR
-DESTSLIBDIR := $(DESTDIR)$(SLIBDIR)
-else
-DESTSLIBDIR := $(DESTLIBDIR)
-endif
-
-endif # WINDOWS_TARGET