Skip to content

Commit

Permalink
Fix path to LICENSE and README.md
Browse files Browse the repository at this point in the history
This also fixes compilation
  • Loading branch information
maxteufel committed Mar 22, 2015
1 parent 9410759 commit 0c51300
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Expand Up @@ -434,7 +434,7 @@ ENDIF(WIN32 AND NOT UNIX)

INSTALL(TARGETS supertux2 DESTINATION ${INSTALL_SUBDIR_BIN})

INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/COPYING ${CMAKE_CURRENT_SOURCE_DIR}/WHATSNEW.txt DESTINATION ${INSTALL_SUBDIR_DOC})
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/INSTALL.md ${CMAKE_CURRENT_SOURCE_DIR}/README.md ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/WHATSNEW.txt DESTINATION ${INSTALL_SUBDIR_DOC})

INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/credits.txt DESTINATION ${INSTALL_SUBDIR_SHARE})

Expand Down Expand Up @@ -473,7 +473,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
# The OS X PackageMaker doesn't seem to like files with no extension
ELSE(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
SET(CPACK_PACKAGE_VERSION_MAJOR "0")
SET(CPACK_PACKAGE_VERSION_MINOR "3")
Expand Down
2 changes: 1 addition & 1 deletion makedist.sh
Expand Up @@ -12,7 +12,7 @@ fi
echo "Creating directory $DISTDIR"
mkdir "$DISTDIR" || exit 1

cp "CMakeLists.txt" "COPYING" "INSTALL.md" "README.md" "WHATSNEW.txt" "config.h.cmake" "makedist.sh" "makepot.sh" "supertux2.desktop" $DISTDIR
cp "CMakeLists.txt" "LICENSE" "INSTALL.md" "README.md" "WHATSNEW.txt" "config.h.cmake" "makedist.sh" "makepot.sh" "supertux2.desktop" $DISTDIR
cp --parents mk/cmake/*.cmake $DISTDIR
cp --parents mk/msvc/* $DISTDIR

Expand Down
2 changes: 1 addition & 1 deletion src/supertux/title_screen.cpp
Expand Up @@ -57,7 +57,7 @@ TitleScreen::TitleScreen(Savegame& savegame) :
copyright_text = "SuperTux " PACKAGE_VERSION "\n" +
_("Copyright") + " (c) 2003-2015 SuperTux Devel Team\n" +
_("This game comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to\n"
"redistribute it under certain conditions; see the file COPYING for details.\n"
"redistribute it under certain conditions; see the file LICENSE for details.\n"
);
}

Expand Down
4 changes: 2 additions & 2 deletions tools/innosetup/supertux.iss
Expand Up @@ -37,8 +37,8 @@ VersionInfoVersion=0.3
VersionInfoTextVersion={#MyAppVerName}
AppVersion={#MyAppVer}
UninstallDisplayName={#MyAppVerName}
LicenseFile={#BuildDir}\usr\local\share\doc\supertux-{#MyAppVer}\COPYING
InfoAfterFile={#BuildDir}\usr\local\share\doc\supertux-{#MyAppVer}\README
LicenseFile={#BuildDir}\usr\local\share\doc\supertux-{#MyAppVer}\LICENSE
InfoAfterFile={#BuildDir}\usr\local\share\doc\supertux-{#MyAppVer}\README.md
SetupIconFile={#BuildDir}\usr\local\share\supertux\images\engine\icons\supertux.ico

[Languages]
Expand Down
2 changes: 1 addition & 1 deletion tools/supertux.spec
Expand Up @@ -53,7 +53,7 @@ rm -rf %{buildroot}

%files
%defattr(-,root,root)
%doc COPYING README ChangeLog TODO
%doc LICENSE README.md ChangeLog TODO
#%doc doc/*
/etc/X11/applnk/*
%{_bindir}/*
Expand Down

0 comments on commit 0c51300

Please sign in to comment.