Index: trunk/Makefile.conf.in
===================================================================
--- trunk/Makefile.conf.in	(revision 34903)
+++ trunk/Makefile.conf.in	(revision 34904)
@@ -6,12 +6,6 @@
 uniq /local/pcb/CFLAGS
 uniq /local/pcb/CFLAGS_GENERIC
 
-# calculate the /local/confdir: either specified conf-time or compatibility fallback
-switch /local/confdir
-	case {^$}  put /local/confdir_final_m [@@/local/prefix@/share/pcb-rnd@]; end
-	default    put /local/confdir_final_m /local/confdir; end
-end
-
 print [@# generated by ./configure, do not modify
 
 # Compatibility with autotools on DESTDIR - Debian really wants this
@@ -24,7 +18,7 @@
 BINDIR=$(Install_root)@/local/prefix@/bin
 DATADIR=$(Install_root)@/local/prefix@/share/pcb-rnd
 MAN1DIR=$(Install_root)@/local/prefix@@/local/man1dir@
-CONFDIR=$(Install_root)@/local/confdir_final_m@
+CONFDIR=$(Install_root)@/local/confdir@
 RM=@/host/fstools/rm@
 CP=@/host/fstools/cp@
 LN=@/host/fstools/ln@
Index: trunk/config.h.in
===================================================================
--- trunk/config.h.in	(revision 34903)
+++ trunk/config.h.in	(revision 34904)
@@ -17,17 +17,6 @@
 #define RND_APP_PREFIX(x)  pcb_ ## x
 
 /****************************************************************************/
-/* These ones are already autodetected by scconfig */
-@]
-
-# calculate the /local/confdir: either specified conf-time or compatibility fallback
-switch /local/confdir
-	case {^$} put /local/confdir_final {PCBSHAREDIR}; end
-	default put /local/confdir_final [@"@/local/confdir@"@]; end
-end
-
-print [@
-/****************************************************************************/
 /* Paths */
 @]
 
@@ -38,7 +27,7 @@
 #define PCBSHAREDIR rnd_w32_sharedir
 #define PCBLIBDIR rnd_w32_libdir
 #define BINDIR rnd_w32_bindir
-#define PCBCONFDIR @/local/confdir_final@
+#define PCBCONFDIR @/local/confdir@
 @]
 		end;
 	default
@@ -47,7 +36,7 @@
 #define PCBSHAREDIR PCB_PREFIX "/share/pcb-rnd"
 #define PCBLIBDIR PCB_PREFIX "/lib/pcb-rnd"
 #define BINDIR PCB_PREFIX "/bin"
-#define PCBCONFDIR @/local/confdir_final@
+#define PCBCONFDIR "@/local/confdir@"
 @]
 		end;
 end;