summarylogtreecommitdiffstats
path: root/no-fc-cache-no-lib64.patch
blob: 466251658c270c6c8cb99acc98f4dd2727ae0975 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
diff --git a/configure b/configure
index c5f25a4..6c15e46 100755
--- a/configure
+++ b/configure
@@ -19813,7 +19813,7 @@ _ACEOF
 	*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;;
     esac
     case $ac_im_usrlibdir in
-	/usr/lib | /usr/lib64 | /lib | /lib64) ;;
+	/usr/lib | /usr/lib | /lib | /lib) ;;
 	*) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;;
     esac
   fi
@@ -24802,7 +24802,7 @@ fi
     ;;
   linux*)
     if test x"$host_cpu" = "xx86_64"; then
-      VICEDIR="$PREFIX/lib64/vice"
+      VICEDIR="$PREFIX/lib/vice"
        if false; then
   ALTERNATE_DOCDIR_TRUE=
   ALTERNATE_DOCDIR_FALSE='#'
diff --git a/configure.ac b/configure.ac
index 73f5b22..842e246 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2954,12 +2954,7 @@ if test x"$enable_lame" != "xno" ; then
 
 fi
 
-AC_PATH_PROGS(FCCACHE, fc-cache, false)
-if test x"$FCCACHE" = "xfalse"; then
-  AM_CONDITIONAL(HAVE_FC_CACHE, false)
-else
-  AM_CONDITIONAL(HAVE_FC_CACHE, true)
-fi
+AM_CONDITIONAL(HAVE_FC_CACHE, false)
 
 if test x"$is_amigaos4" = "xyes"; then
   if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then
@@ -4636,7 +4631,7 @@ case "$host_os" in
     ;;
   linux*)
     if test x"$host_cpu" = "xx86_64"; then
-      VICEDIR="$PREFIX/lib64/vice"
+      VICEDIR="$PREFIX/lib/vice"
       AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
     else
       VICEDIR="$PREFIX/lib/vice"
diff --git a/configure.proto b/configure.proto
index 73f5b22..842e246 100755
--- a/configure.proto
+++ b/configure.proto
@@ -2954,12 +2954,7 @@ if test x"$enable_lame" != "xno" ; then
 
 fi
 
-AC_PATH_PROGS(FCCACHE, fc-cache, false)
-if test x"$FCCACHE" = "xfalse"; then
-  AM_CONDITIONAL(HAVE_FC_CACHE, false)
-else
-  AM_CONDITIONAL(HAVE_FC_CACHE, true)
-fi
+AM_CONDITIONAL(HAVE_FC_CACHE, false)
 
 if test x"$is_amigaos4" = "xyes"; then
   if test x"$enable_sdlui" != "xyes" -a x"$enable_sdlui2" != "xyes"; then
@@ -4636,7 +4631,7 @@ case "$host_os" in
     ;;
   linux*)
     if test x"$host_cpu" = "xx86_64"; then
-      VICEDIR="$PREFIX/lib64/vice"
+      VICEDIR="$PREFIX/lib/vice"
       AM_CONDITIONAL(ALTERNATE_DOCDIR, false)
     else
       VICEDIR="$PREFIX/lib/vice"