From 72ff6cb80bed277948dba4ce4a2ebf9f0355c54e Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Wed, 24 May 2000 05:57:56 +0000
Subject: [PATCH] FS_.*PATH have been eliminated as fs_userpath and
 fs_sharepath default to . and can be configured by
 ${sysconfdir}/quakeforge.conf

---
 acconfig.h                |  6 ------
 configure.in              | 25 -------------------------
 include/win32/bc/config.h |  9 ---------
 include/win32/vc/config.h |  9 ---------
 4 files changed, 49 deletions(-)

diff --git a/acconfig.h b/acconfig.h
index d3b9e5c..8880084 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -19,12 +19,6 @@
 /* Define this to the location of the global config file */
 #undef FS_GLOBALCFG
 
-/* Define this to the shared game directory root */
-#undef FS_SHAREPATH
-
-/* Define this to the unshared game directory root */
-#undef FS_USERPATH
-
 /* Define this to the base game for the engine to load */
 #undef BASEGAME
 
diff --git a/configure.in b/configure.in
index 4239a5c..ca99b66 100644
--- a/configure.in
+++ b/configure.in
@@ -632,31 +632,6 @@ else
 	AC_DEFINE_UNQUOTED(FS_GLOBALCFG,	$globalconf)
 fi
 
-AC_ARG_WITH(sharepath,
-[  --with-sharepath=DIR    Use DIR for shared game data, defaults to
-                          \${datadir}/games/quakeforge],
-SHAREPATH=$withval, SHAREPATH="auto")
-if test "x$SHAREPATH" = "xauto" -o "x$SHAREPATH" = "xyes" -o "x$SHAREPATH" = "x"; then
-	eval foo="$datadir"
-	AC_DEFINE_UNQUOTED(FS_SHAREPATH, "$foo/games/quakeforge")
-elif test "x$SHAREPATH" = xno; then
-	AC_DEFINE_UNQUOTED(FS_SHAREPATH, ".")
-else
-	AC_DEFINE_UNQUOTED(FS_SHAREPATH, "$SHAREPATH")
-fi
-
-AC_ARG_WITH(userpath,
-[  --with-userpath=DIR     Use DIR for unshared game data, defaults to
-                          \${HOME}/.quakeforge],
-USERPATH=$withval, USERPATH="auto")
-if test "x$USERPATH" = "xauto" -o "x$USERPATH" = "xyes" -o "x$USERPATH" = "x"; then
-	AC_DEFINE_UNQUOTED(FS_USERPATH, "~/.quakeforge")
-elif test "x$USERPATH" = xno; then
-   AC_DEFINE_UNQUOTED(FS_USERPATH, ".")
-else
-   AC_DEFINE_UNQUOTED(FS_USERPATH, "$USERPATH")
-fi
-
 dnl CFLAGS for release and devel versions
 AC_ARG_ENABLE(release,
 	[  --enable-release        compile release (with optimizations)],
diff --git a/include/win32/bc/config.h b/include/win32/bc/config.h
index 10bf287..212d364 100644
--- a/include/win32/bc/config.h
+++ b/include/win32/bc/config.h
@@ -254,9 +254,6 @@
 /* Define if you want the QSG standards */
 #define QSG_VERSION "1"
 
-/* Define what the base path should be */
-#define FS_BASEPATH "."
-
 /* Define the name of the global config file */
 #define GLOBAL_CFG_FILE ".\\qforge.cfg"
 
@@ -266,12 +263,6 @@
 /* Define if we've scitech MGL library and mgraph.h */
 #define HAVE_MGRAPH_H 1
 
-/* Dir used for shared game data */
-#define FS_SHAREPATH "."
-
-/* Dir used for shared game data */
-#define FS_USERPATH "."
-
 #define FS_GLOBALCFG ".\\qforge.cfg"
 
 #define strcasecmp(s1, s2) stricmp((s1), (s2))
diff --git a/include/win32/vc/config.h b/include/win32/vc/config.h
index d53d0de..f892cab 100644
--- a/include/win32/vc/config.h
+++ b/include/win32/vc/config.h
@@ -260,9 +260,6 @@
 /* Define if you want the QSG standards */
 #define QSG_VERSION "1"
 
-/* Define what the base path should be */
-#define FS_BASEPATH "."
-
 /* Define the name of the global config file */
 #define GLOBAL_CFG_FILE ".\\qforge.cfg"
 
@@ -272,12 +269,6 @@
 /* Define if we've scitech MGL library and mgraph.h */
 #define HAVE_MGRAPH_H 1
 
-/* Dir used for shared game data */
-#define FS_SHAREPATH "."
-
-/* Dir used for shared game data */
-#define FS_USERPATH "."
-
 #define FS_GLOBALCFG ".\\qforge.cfg"
 
 #define strcasecmp(s1, s2) stricmp((s1), (s2))