summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPřemysl Janouch <p.janouch@gmail.com>2011-04-21 14:43:40 +0200
committerPřemysl Janouch <p.janouch@gmail.com>2011-06-09 21:11:22 +0200
commit423afa8eec9b87a2b011b9a55f67eaac08c027c7 (patch)
treef30540126e70da8b15f1d021158843e53a982245
parentef2966e9bcd458069aa5af79de606c867729f4ef (diff)
downloadlogdiag-423afa8eec9b87a2b011b9a55f67eaac08c027c7.tar.gz
logdiag-423afa8eec9b87a2b011b9a55f67eaac08c027c7.tar.xz
logdiag-423afa8eec9b87a2b011b9a55f67eaac08c027c7.zip
Fix .deb package generation.
Update the README instructions, too, since fakeroot is essential. Ubuntu 11.04 did not want to accept the package previously.
-rw-r--r--CMakeLists.txt3
-rw-r--r--README.md2
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f1591e..151e000 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -304,7 +304,7 @@ endif (WIN32)
# CPack
set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Schematic editor")
set (CPACK_PACKAGE_VENDOR "Premysl Janouch")
-set (CPACK_PACKAGE_CONTACT "p.janouch@gmail.com")
+set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p.janouch@gmail.com>")
set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
set (CPACK_PACKAGE_VERSION_MAJOR ${project_VERSION_MAJOR})
set (CPACK_PACKAGE_VERSION_MINOR ${project_VERSION_MINOR})
@@ -314,6 +314,7 @@ if (WIN32)
set (CPACK_GENERATOR "NSIS;ZIP")
else (WIN32)
set (CPACK_GENERATOR "TGZ;ZIP")
+ set (CPACK_SET_DESTDIR TRUE)
endif (WIN32)
set (CPACK_PACKAGE_FILE_NAME
diff --git a/README.md b/README.md
index dafcbf6..3b0506c 100644
--- a/README.md
+++ b/README.md
@@ -40,7 +40,7 @@ Now you have two basic choices of installing the application:
system package manager. CMake offers DEB and RPM.
After _cpack_ finishes making the package, install this file.
- $ cpack -G DEB
+ $ fakeroot cpack -G DEB
# dpkg -i logdiag-0.0-Linux-x86_64.deb
# Building from sources on Windows