X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=configure;h=d53522930009126a17aff731207bbdd1e211389f;hb=e67ec0f4f055ad6b41fb17024cb4496b66054ada;hp=d25e22a4b3820951164753053d173fb93e92860e;hpb=553d330d06573b6bc951e3c00672a1abfe29b7aa;p=glaze

diff --git a/configure b/configure
index d25e22a..d535229 100755
--- a/configure
+++ b/configure
@@ -180,7 +180,16 @@ then
     printf "	Target directory for 32-bit targets... "
 
     lib32_dir=$(gcc -m32 --print-multiarch)
-    printf "${lib32_dir}\n"
+
+    if [ "$lib32_dir" = "" ]; then
+	lib32_dir="i386-linux-gnu"
+	printf "\n\n"
+	printf "\t\t*** Warning: Failed to query target directory.\n"
+	printf "\t\tHard-coding to $lib32_dir\n"
+	printf "\t\tFix  LIB32_DIR in Makefile.config as needed.\n\n"
+    else
+	printf "${lib32_dir}\n"
+    fi
 
 else
     printf "No.\n"
@@ -196,7 +205,16 @@ then
     printf "	Target directory for 64-bit targets... "
 
     lib64_dir=$(gcc -m64 --print-multiarch)
-    printf "${lib64_dir}\n"
+
+    if [ "$lib64_dir" = "" ]; then
+	lib64_dir="x86_64-linux-gnu"
+	printf "\n\n"
+	printf "\t\t*** Warning: Failed to query target directory.\n"
+	printf "\t\tHard-coding to $lib64_dir\n"
+	printf "\t\tFix LIB64_DIR in Makefile.config as needed.\n\n"
+    else
+	printf "${lib64_dir}\n"
+    fi
 
 else
     printf "No.\n"
@@ -285,6 +303,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}