Updated build scripts

Author: sadko4u

make/configure.mk

@@ -37,15 +37,6 @@ include $(BASEDIR)/make/tools.mk
 include $(BASEDIR)/modules.mk
 include $(BASEDIR)/dependencies.mk
 
-# Definitions
-ifeq ($(PLATFORM),Windows)
-  PREFIX                     := $(BASEDIR)/INSTALL
-  ETCDIR                     := $(BASEDIR)/etc
-else
-  PREFIX                     := /usr/local
-  ETCDIR                     := /etc
-endif
-
 ifeq ($(DEVEL),1)
   X_URL_SUFFIX                = _RW
 else

make/paths.mk

@@ -18,6 +18,24 @@
 # along with lsp-r3d-base-lib.  If not, see <https://www.gnu.org/licenses/>.
 #
 
+# Installation prefix
+ifndef PREFIX
+  ifeq ($(PLATFORM),Windows)
+    PREFIX                     := $(BASEDIR)/INSTALL
+  else
+    PREFIX                     := /usr/local
+  endif
+endif
+
+# Path to configuration
+ifndef ETCDIR
+  ifeq ($(PLATFORM),Windows)
+    ETCDIR                     := $(PREFIX)/etc
+  else
+    ETCDIR                     := /etc
+  endif
+endif
+
 LIBDIR                     := $(PREFIX)/lib
 BINDIR                     := $(PREFIX)/bin
 SHAREDDIR                  := $(PREFIX)/share
@@ -28,15 +46,6 @@ HOST_BUILDDIR              := $(BUILDDIR)/host
 MODULES                    := $(BASEDIR)/modules
 CONFIG                     := $(BASEDIR)/.config.mk
 
-# Installation prefix
-ifndef PREFIX
-  ifeq ($(PLATFORM),Windows)
-    PREFIX                   := $(ProgramFiles)
-  else
-    PREFIX                   := /usr/local
-  endif
-endif
-
 # Library prefix
 ifndef LIBDIR
   LIBDIR                   := $(PREFIX)/lib