diff options
| -rw-r--r-- | AUTHORS (renamed from data/AUTHORS) | 0 | ||||
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | LICENCE (renamed from data/LICENCE) | 0 | ||||
| -rw-r--r-- | README (renamed from data/README) | 0 | ||||
| -rw-r--r-- | config.h | 2 | ||||
| -rw-r--r-- | packaging/gentoo/tuxanci-9999.ebuild | 13 |
6 files changed, 10 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d0be45..120d5a3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,7 +23,7 @@ SET ( CMAKE_OSX_ARCHITECTURES ppc i386 ) SET ( CMAKE_COLOR_MAKEFILE ON ) ## balickovani -SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/data/README" ) +SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README" ) SET ( CPACK_GENERATOR "TBZ2" ) SET ( CPACK_SOURCE_GENERATOR "TBZ2" ) SET ( CPACK_PACKAGE_VERSION_MAJOR "0" ) @@ -47,9 +47,9 @@ IF ( Dist ) SET ( CMAKE_INSTALL_PREFIX ${CMAKE_SOURCE_DIR}/dist ) ENDIF ( Dist ) IF ( Debug ) - SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0") - SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O0") - SET ( CMAKE_VERBOSE_MAKEFILE on ) + SET( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O2 -Wall -pipe") + SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -O2 -Wall -pipe") +# SET ( CMAKE_VERBOSE_MAKEFILE on ) ENDIF ( Debug) MESSAGE ( "EXTRA Cflags:${CMAKE_C_FLAGS}" ) MESSAGE ( "EXTRA CXXflags:${CMAKE_CXX_FLAGS}" ) @@ -86,9 +86,9 @@ ELSE ( Server ) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/sound/*.ogg" ) INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/sound/ ) ENDIF ( Server ) -INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/LICENCE DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/) -INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/AUTHORS DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/ ) -INSTALL ( FILES ${CMAKE_SOURCE_DIR}/data/README DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/) +INSTALL ( FILES ${CMAKE_SOURCE_DIR}/LICENCE DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/) +INSTALL ( FILES ${CMAKE_SOURCE_DIR}/AUTHORS DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/ ) +INSTALL ( FILES ${CMAKE_SOURCE_DIR}/README DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/doc/) FILE ( GLOB files "${CMAKE_SOURCE_DIR}/data/arena/*.map" ) INSTALL ( FILES ${files} DESTINATION ${CMAKE_INSTALL_DATADIR}/${APPNAME}/arena/ ) # uninstall @@ -1 +1 @@ -#define TUXANCI_NG_VERSION "svn111" +#define TUXANCI_NG_VERSION "svn112" diff --git a/packaging/gentoo/tuxanci-9999.ebuild b/packaging/gentoo/tuxanci-9999.ebuild index b1db205..88c559d 100644 --- a/packaging/gentoo/tuxanci-9999.ebuild +++ b/packaging/gentoo/tuxanci-9999.ebuild @@ -30,29 +30,20 @@ src_unpack() { cd "${S}" # setting proper prefix sed -i \ - -e "s:/usr/local/:${GAMES_PREFIX}/:" config.h \ + -e "s:PATH_DIR\tPREFIX:PATH_DIR:" src/base/path.h \ || die "sed config.h failed!" sed -i \ -e "s:share/tuxanci-ng:${GAMES_DATADIR}/tuxanci-ng:" src/base/path.h \ || die "sed config.h failed!" sed -i \ - -e "s:DESTDIR PATH_DIR:PATH_DIR:" src/base/path.h \ - || die "sed config.h failed!" - # setting proper install path - sed -i \ -e "s:CMAKE_INSTALL_DATADIR share/:CMAKE_INSTALL_DATADIR /usr/share/games/:" CMakeLists.txt \ || die "sed CMakeLists.txt failed!" - sed -i \ - -e "s:CMAKE_INSTALL_BINDIR bin:CMAKE_INSTALL_BINDIR /usr/games/bin:" src/CMakeLists.txt \ - || die "sed src/CMakeLists.txt failed!" - sed -i \ - -e "s:CMAKE_INSTALL_LIBDIR lib:CMAKE_INSTALL_LIBDIR /usr/games/lib:" src/CMakeLists.txt \ - || die "sed src/MakeLists.txt failed!" } src_compile() { local mycmakeargs use alsa || mycmakeargs="${mycmakeargs} -DNO_Audio=1" use dedicated && mycmakeargs="${mycmakeargs} -DNO_Server=1" + mycmakeargs="${mycmakeargs} -DPREFIX=\\\"/usr/games\\\" -DCMAKE_INSTALL_PREFIX:PATH=/usr/games" cmake-utils_src_compile } src_install() { |