X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=configure;h=4df846b278b113b63d0d8cf0d4e021f565c3bd0a;hb=fded9f20d5f5c92bd5af051117327816dda0238e;hp=d115790d56296b6d99f9d732b525f226cf6c04fa;hpb=cec0694a7f219bd3590e6a04beba34ca45539540;p=glaze

diff --git a/configure b/configure
index d115790..4df846b 100755
--- a/configure
+++ b/configure
@@ -176,6 +176,12 @@ have_m32=Yes
 if ${CC} -m32 -o arch-minimal arch-minimal.c > /dev/null 2>&1
 then
     printf "Yes.\n"
+
+    printf "	Target directory for 32-bit targets... "
+
+    lib32_dir=$(gcc -m32 --print-multiarch)
+    printf "${lib32_dir}\n"
+
 else
     printf "No.\n"
     have_m32=No
@@ -186,6 +192,12 @@ have_m64=Yes
 if ${CC} -m64 -o arch-minimal arch-minimal.c > /dev/null 2>&1
 then
     printf "Yes.\n"
+
+    printf "	Target directory for 64-bit targets... "
+
+    lib64_dir=$(gcc -m64 --print-multiarch)
+    printf "${lib64_dir}\n"
+
 else
     printf "No.\n"
     have_m64=No
@@ -261,7 +273,9 @@ INCLUDEDIR = ${INCLUDEDIR:-\$(PREFIX)/include}
 
 # Whether compiler can create 32 or 64-bit binaries
 COMPILER_SUPPORTS_32 = ${have_m32}
+LIB32_DIR = lib/${lib32_dir}
 COMPILER_SUPPORTS_64 = ${have_m64}
+LIB64_DIR = lib/${lib64_dir}
 
 # Version information for glaze library
 MAJOR   = ${MAJOR}
@@ -271,6 +285,22 @@ VERSION = ${VERSION}
 
 EOF
 
+# construct config.h
+QQ='"'
+cat > config.h <<EOF
+/* Generated by configure */
+
+/* The prefix to which ${PROJECT} should be installed */
+#define CONFIG_PREFIX "${PREFIX}"
+
+/* The directory to which libraries should be installed */
+#define CONFIG_LIBDIR "${LIBDIR:-${QQ} CONFIG_PREFIX ${QQ}/lib}"
+
+/* The directory to which executables should be installed */
+#define CONFIG_BINDIR "${BINDIR:-${QQ} CONFIG_PREFIX ${QQ}/bin}"
+
+EOF
+
 # construct the glaze.pc file
 cat > glaze.pc <<EOF
 prefix=${PREFIX}