Attachment #109318 for bug #150319




--- CMakeLists.txt.orig	2010-08-20 10:49:10.000000000 -0700
+++ CMakeLists.txt	2010-09-06 01:23:35.000000000 -0700
@@ -57,7 +57,6 @@
 	SET_PATH( BIN_DIR ${CMAKE_INSTALL_PREFIX} )
 	SET_PATH( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX} )
 	SET_PATH( LIB_DIR ${CMAKE_INSTALL_PREFIX} )
-	SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/doc )
 	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX} )
 	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX} )
 elseif (${LAYOUT} MATCHES "fhs")
@@ -73,7 +72,6 @@
 			SET( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX}/etc/gemrb )
 		endif ()
 	ENDIF( NOT SYSCONF_DIR )
-	SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/gemrb )
 	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/pixmaps )
 	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
 else (${LAYOUT} MATCHES "opt")
@@ -83,7 +81,6 @@
 	SET_PATH( MAN_DIR ${CMAKE_INSTALL_PREFIX}/man/man6 )
 	SET_PATH( BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin )
 	SET_PATH( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX}/etc )
-	SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/gemrb )
 	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/pixmaps )
 	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
 endif (${LAYOUT} MATCHES "home")
@@ -267,7 +264,6 @@
 INSTALL( FILES gemrb.6 DESTINATION ${MAN_DIR} )
 INSTALL( FILES artwork/gemrb-logo.png DESTINATION ${ICON_DIR} )
 INSTALL( FILES gemrb.desktop DESTINATION ${MENU_DIR} )
-INSTALL( FILES README INSTALL COPYING NEWS AUTHORS DESTINATION ${DOC_DIR} )
 
 CONFIGURE_FILE(
   "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
@@ -303,7 +299,6 @@
 message(STATUS "  DATA_DIR: ${DATA_DIR}")
 message(STATUS "  MAN_DIR: ${MAN_DIR}")
 message(STATUS "  SYSCONF_DIR: ${SYSCONF_DIR}")
-message(STATUS "  DOC_DIR: ${DOC_DIR}")
 message(STATUS "  ICON_DIR: ${ICON_DIR}")
 message(STATUS "  MENU_DIR: ${MENU_DIR}")
 message(STATUS "")

Lines 1-9 Link Here

(-)files/extra-patch-noportdocs-Makefile.am (-9 lines)
1	--- Makefile.am.orig 2009-06-07 06:07:25.000000000 -0700
2	+++ Makefile.am 2009-07-07 14:50:13.000000000 -0700
3	@@ -29,6 +29,3 @@
4
5	install-data-hook:
6	rm -f $(DESTDIR)$(bindir)/plugins/libgemrb_core.so
7	-
8	-docs:
9	- doxygen




--- Makefile.in.orig	2009-11-03 07:31:16.000000000 -0800
+++ Makefile.in	2009-12-29 23:24:29.000000000 -0800
@@ -231,7 +231,6 @@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
@@ -855,9 +854,6 @@
 install-data-hook:
 	rm -f $(DESTDIR)$(bindir)/plugins/libgemrb_core.so
 
-docs:
-	doxygen
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:




--- configure.orig	2009-11-03 07:31:18.000000000 -0800
+++ configure	2009-12-29 23:25:57.000000000 -0800
@@ -851,10 +851,7 @@
 libdir
 psdir
 pdfdir
-dvidir
-htmldir
 infodir
-docdir
 oldincludedir
 includedir
 localstatedir
@@ -949,12 +946,7 @@
 localstatedir='${prefix}/var'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
 infodir='${datarootdir}/info'
-htmldir='${docdir}'
-dvidir='${docdir}'
-pdfdir='${docdir}'
-psdir='${docdir}'
 libdir='${exec_prefix}/lib'
 localedir='${datarootdir}/locale'
 mandir='${datarootdir}/man'
@@ -1029,11 +1021,6 @@
     esac
     eval enable_$ac_useropt=no ;;
 
-  -docdir | --docdir | --docdi | --doc | --do)
-    ac_prev=docdir ;;
-  -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*)
-    docdir=$ac_optarg ;;
-
   -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
     ac_prev=dvidir ;;
   -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*)
@@ -1334,7 +1321,7 @@
 # Check all directory arguments for consistency.
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
-		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+		oldincludedir infodir \
 		libdir localedir mandir
 do
   eval ac_val=\$$ac_var
@@ -15561,10 +15548,6 @@
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 
-if test "x$docdir" = "x" ; then
-  docdir=$datadir/doc
-fi
-
 # Check whether --enable-subdirs was given.
 if test "${enable_subdirs+set}" = set; then :
   enableval=$enable_subdirs; gemrb_use_subdirs=$enableval
@@ -19890,11 +19873,6 @@
     "gemrb/plugins/WEDImporter/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/WEDImporter/Makefile" ;;
     "gemrb/plugins/WMPImporter/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/WMPImporter/Makefile" ;;
     "gemrb/plugins/ZLibMgr/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/ZLibMgr/Makefile" ;;
-    "gemrb/docs/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/Makefile" ;;
-    "gemrb/docs/en/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/Makefile" ;;
-    "gemrb/docs/en/GUIScript/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/GUIScript/Makefile" ;;
-    "gemrb/docs/en/Tables/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/Tables/Makefile" ;;
-    "gemrb/docs/en/Engine/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/Engine/Makefile" ;;
     "gemrb.spec") CONFIG_FILES="$CONFIG_FILES gemrb.spec" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

Line 0 Link Here

(-)files/extra-patch-noportdocs-gemrb-CMakeLists.txt (+10 lines)
	1	--- gemrb/CMakeLists.txt.orig 2010-08-20 10:49:10.000000000 -0700
	2	+++ gemrb/CMakeLists.txt 2010-09-06 01:40:42.000000000 -0700
	3	@@ -2,7 +2,6 @@
	4	ADD_SUBDIRECTORY( plugins )
	5	ADD_SUBDIRECTORY( override )
	6	ADD_SUBDIRECTORY( GUIScripts )
	7	-ADD_SUBDIRECTORY( docs )
	8	ADD_SUBDIRECTORY( tests )
	9
	10	ADD_EXECUTABLE(gemrb GemRB.cpp )




--- gemrb/Makefile.in.orig	2009-11-03 07:31:04.000000000 -0800
+++ gemrb/Makefile.in	2009-12-29 23:33:24.000000000 -0800
@@ -235,7 +235,6 @@
 builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
-docdir = @docdir@
 dvidir = @dvidir@
 exec_prefix = @exec_prefix@
 host = @host@
@@ -276,7 +275,7 @@
 sysconf_DATA = GemRB.cfg.sample GemRB.cfg.subdir.sample
 gemrb_SOURCES = GemRB.cpp 
 gemrb_LDADD = ./plugins/Core/libgemrb_core.la
-SUBDIRS = plugins includes GUIScripts override docs
+SUBDIRS = plugins includes GUIScripts override
 EXTRA_DIST = GemRB.cfg* plugins-prepare.sh CMakeLists.txt
 INCLUDES = \
 	$(all_includes) \

Line 0 Link Here

(-)files/extra-patch-noportdocs-gemrb-docs-CMakeLists.txt (+4 lines)
	1	--- gemrb/docs/CMakeLists.txt.orig 2010-08-20 10:49:10.000000000 -0700
	2	+++ gemrb/docs/CMakeLists.txt 2010-09-06 01:43:26.000000000 -0700
	3	@@ -1 +0,0 @@
	4	-ADD_SUBDIRECTORY( en )




--- CMakeLists.txt.orig	2010-08-20 10:49:10.000000000 -0700
+++ CMakeLists.txt	2010-09-05 23:18:12.000000000 -0700
@@ -137,18 +137,6 @@
 	MESSAGE(FATAL_ERROR "Please install the Zlib library and headers first!")
 ENDIF()
 
-IF(UNIX)
-	FIND_LIBRARY(DLD_LIBRARY_PATH dl dld)
-	IF(DLD_LIBRARY_PATH)
-		MESSAGE(STATUS "Looking for dl library: found")
-	ELSE(DLD_LIBRARY_PATH)
-		MESSAGE(FATAL_ERROR "Looking for dl library: not found!")
-	ENDIF(DLD_LIBRARY_PATH)
-
-	SET(CMAKE_THREAD_PREFER_PTHREAD true)
-	FIND_PACKAGE(Threads REQUIRED)
-ENDIF(UNIX)
-
 INCLUDE(FindOpenAL)
 IF(OPENAL_FOUND)
 	MESSAGE(STATUS "Looking for OpenAL: found")

Lines 1-11 Link Here

(-)files/patch-gemrb.cfg (-11 lines)
1	--- gemrb/GemRB.cfg.sample.orig 2008-02-17 09:07:28.000000000 -0800
2	+++ gemrb/GemRB.cfg.sample 2008-04-21 19:22:34.000000000 -0700
3	@@ -226,7 +226,7 @@
4	# You probably do NOT want to specify this! #
5	#####################################################
6
7	-#GemRBOverridePath=/usr/share/games/gemrb
8	+GemRBOverridePath=/usr/local/share/gemrb
9
10	#####################################################
11	# END #

Return to bug 150319

Line 0 Link Here

(-)files/extra-patch-noportdocs-CMakeLists.txt (+42 lines)
	1	--- CMakeLists.txt.orig 2010-08-20 10:49:10.000000000 -0700
	2	+++ CMakeLists.txt 2010-09-06 01:23:35.000000000 -0700
	3	@@ -57,7 +57,6 @@
	4	SET_PATH( BIN_DIR ${CMAKE_INSTALL_PREFIX} )
	5	SET_PATH( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX} )
	6	SET_PATH( LIB_DIR ${CMAKE_INSTALL_PREFIX} )
	7	- SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/doc )
	8	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX} )
	9	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX} )
	10	elseif (${LAYOUT} MATCHES "fhs")
	11	@@ -73,7 +72,6 @@
	12	SET( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX}/etc/gemrb )
	13	endif ()
	14	ENDIF( NOT SYSCONF_DIR )
	15	- SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/gemrb )
	16	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/pixmaps )
	17	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
	18	else (${LAYOUT} MATCHES "opt")
	19	@@ -83,7 +81,6 @@
	20	SET_PATH( MAN_DIR ${CMAKE_INSTALL_PREFIX}/man/man6 )
	21	SET_PATH( BIN_DIR ${CMAKE_INSTALL_PREFIX}/bin )
	22	SET_PATH( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX}/etc )
	23	- SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/gemrb )
	24	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/pixmaps )
	25	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
	26	endif (${LAYOUT} MATCHES "home")
	27	@@ -267,7 +264,6 @@
	28	INSTALL( FILES gemrb.6 DESTINATION ${MAN_DIR} )
	29	INSTALL( FILES artwork/gemrb-logo.png DESTINATION ${ICON_DIR} )
	30	INSTALL( FILES gemrb.desktop DESTINATION ${MENU_DIR} )
	31	-INSTALL( FILES README INSTALL COPYING NEWS AUTHORS DESTINATION ${DOC_DIR} )
	32
	33	CONFIGURE_FILE(
	34	"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
	35	@@ -303,7 +299,6 @@
	36	message(STATUS " DATA_DIR: ${DATA_DIR}")
	37	message(STATUS " MAN_DIR: ${MAN_DIR}")
	38	message(STATUS " SYSCONF_DIR: ${SYSCONF_DIR}")
	39	-message(STATUS " DOC_DIR: ${DOC_DIR}")
	40	message(STATUS " ICON_DIR: ${ICON_DIR}")
	41	message(STATUS " MENU_DIR: ${MENU_DIR}")
	42	message(STATUS "")

Lines 1-20 Link Here

(-)files/extra-patch-noportdocs-Makefile.in (-20 lines)
1	--- Makefile.in.orig 2009-11-03 07:31:16.000000000 -0800
2	+++ Makefile.in 2009-12-29 23:24:29.000000000 -0800
3	@@ -231,7 +231,6 @@
4	builddir = @builddir@
5	datadir = @datadir@
6	datarootdir = @datarootdir@
7	-docdir = @docdir@
8	dvidir = @dvidir@
9	exec_prefix = @exec_prefix@
10	host = @host@
11	@@ -855,9 +854,6 @@
12	install-data-hook:
13	rm -f $(DESTDIR)$(bindir)/plugins/libgemrb_core.so
14
15	-docs:
16	- doxygen
17	-
18	# Tell versions [3.59,3.63) of GNU make to not export all variables.
19	# Otherwise a system limit (for SysV at least) may be exceeded.
20	.NOEXPORT:

Lines 1-70 Link Here

(-)files/extra-patch-noportdocs-configure (-70 lines)
1	--- configure.orig 2009-11-03 07:31:18.000000000 -0800
2	+++ configure 2009-12-29 23:25:57.000000000 -0800
3	@@ -851,10 +851,7 @@
4	libdir
5	psdir
6	pdfdir
7	-dvidir
8	-htmldir
9	infodir
10	-docdir
11	oldincludedir
12	includedir
13	localstatedir
14	@@ -949,12 +946,7 @@
15	localstatedir='${prefix}/var'
16	includedir='${prefix}/include'
17	oldincludedir='/usr/include'
18	-docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
19	infodir='${datarootdir}/info'
20	-htmldir='${docdir}'
21	-dvidir='${docdir}'
22	-pdfdir='${docdir}'
23	-psdir='${docdir}'
24	libdir='${exec_prefix}/lib'
25	localedir='${datarootdir}/locale'
26	mandir='${datarootdir}/man'
27	@@ -1029,11 +1021,6 @@
28	esac
29	eval enable_$ac_useropt=no ;;
30
31	- -docdir \| --docdir \| --docdi \| --doc \| --do)
32	- ac_prev=docdir ;;
33	- -docdir=* \| --docdir=* \| --docdi=* \| --doc=* \| --do=*)
34	- docdir=$ac_optarg ;;
35	-
36	-dvidir \| --dvidir \| --dvidi \| --dvid \| --dvi \| --dv)
37	ac_prev=dvidir ;;
38	-dvidir=* \| --dvidir=* \| --dvidi=* \| --dvid=* \| --dvi=* \| --dv=*)
39	@@ -1334,7 +1321,7 @@
40	# Check all directory arguments for consistency.
41	for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
42	datadir sysconfdir sharedstatedir localstatedir includedir \
43	- oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
44	+ oldincludedir infodir \
45	libdir localedir mandir
46	do
47	eval ac_val=\$$ac_var
48	@@ -15561,10 +15548,6 @@
49	ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
50
51
52	-if test "x$docdir" = "x" ; then
53	- docdir=$datadir/doc
54	-fi
55	-
56	# Check whether --enable-subdirs was given.
57	if test "${enable_subdirs+set}" = set; then :
58	enableval=$enable_subdirs; gemrb_use_subdirs=$enableval
59	@@ -19890,11 +19873,6 @@
60	"gemrb/plugins/WEDImporter/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/WEDImporter/Makefile" ;;
61	"gemrb/plugins/WMPImporter/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/WMPImporter/Makefile" ;;
62	"gemrb/plugins/ZLibMgr/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/plugins/ZLibMgr/Makefile" ;;
63	- "gemrb/docs/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/Makefile" ;;
64	- "gemrb/docs/en/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/Makefile" ;;
65	- "gemrb/docs/en/GUIScript/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/GUIScript/Makefile" ;;
66	- "gemrb/docs/en/Tables/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/Tables/Makefile" ;;
67	- "gemrb/docs/en/Engine/Makefile") CONFIG_FILES="$CONFIG_FILES gemrb/docs/en/Engine/Makefile" ;;
68	"gemrb.spec") CONFIG_FILES="$CONFIG_FILES gemrb.spec" ;;
69
70	*) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;

Lines 1-19 Link Here

(-)files/extra-patch-noportdocs-gemrb-Makefile.in (-19 lines)
1	--- gemrb/Makefile.in.orig 2009-11-03 07:31:04.000000000 -0800
2	+++ gemrb/Makefile.in 2009-12-29 23:33:24.000000000 -0800
3	@@ -235,7 +235,6 @@
4	builddir = @builddir@
5	datadir = @datadir@
6	datarootdir = @datarootdir@
7	-docdir = @docdir@
8	dvidir = @dvidir@
9	exec_prefix = @exec_prefix@
10	host = @host@
11	@@ -276,7 +275,7 @@
12	sysconf_DATA = GemRB.cfg.sample GemRB.cfg.subdir.sample
13	gemrb_SOURCES = GemRB.cpp
14	gemrb_LDADD = ./plugins/Core/libgemrb_core.la
15	-SUBDIRS = plugins includes GUIScripts override docs
16	+SUBDIRS = plugins includes GUIScripts override
17	EXTRA_DIST = GemRB.cfg* plugins-prepare.sh CMakeLists.txt
18	INCLUDES = \
19	$(all_includes) \

Line 0 Link Here

(-)files/patch-CMakeLists.txt (+21 lines)
	1	--- CMakeLists.txt.orig 2010-08-20 10:49:10.000000000 -0700
	2	+++ CMakeLists.txt 2010-09-05 23:18:12.000000000 -0700
	3	@@ -137,18 +137,6 @@
	4	MESSAGE(FATAL_ERROR "Please install the Zlib library and headers first!")
	5	ENDIF()
	6
	7	-IF(UNIX)
	8	- FIND_LIBRARY(DLD_LIBRARY_PATH dl dld)
	9	- IF(DLD_LIBRARY_PATH)
	10	- MESSAGE(STATUS "Looking for dl library: found")
	11	- ELSE(DLD_LIBRARY_PATH)
	12	- MESSAGE(FATAL_ERROR "Looking for dl library: not found!")
	13	- ENDIF(DLD_LIBRARY_PATH)
	14	-
	15	- SET(CMAKE_THREAD_PREFER_PTHREAD true)
	16	- FIND_PACKAGE(Threads REQUIRED)
	17	-ENDIF(UNIX)
	18	-
	19	INCLUDE(FindOpenAL)
	20	IF(OPENAL_FOUND)
	21	MESSAGE(STATUS "Looking for OpenAL: found")