[Pkg-privacy-commits] [irssi-plugin-otr] 24/267: build changes.

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch debian
in repository irssi-plugin-otr.

commit 56b3d371554d455dbc29608f505bb08c0df11697
Author: Uli Meis <a.sporto+bee at gmail.com>
Date:   Fri Jul 11 13:46:02 2008 +0200

    build changes.
    
    * require wget only if needed
    * removed version from doc directory
---
 CMakeLists.txt      | 16 ++++++++--------
 Packaging-DEB.cmake |  2 +-
 Packaging-RPM.cmake |  2 +-
 Packaging.cmake     |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 130c7b4..34a8c9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,10 +54,6 @@ ENDIF(NOT IRSSIOTR_VERSION)
 
 MESSAGE(STATUS "Building irssi-otr version ${IRSSIOTR_VERSION}")
 
-# wget
-
-FIND_PACKAGE(Wget REQUIRED)
-
 # PkgConfig. Only available since 2.4.7, fetch if unavailable so people with
 # older cmake can run this
 
@@ -66,6 +62,7 @@ FIND_PACKAGE(PkgConfig QUIET)
 IF(NOT PKG_CONFIG_FOUND)
   MESSAGE(STATUS "Couldn't find the pkg-config cmake module. Seems you're
   running cmake < 2.4.7. Will try to fetch the module from 2.4.7...")
+  FIND_PACKAGE(Wget REQUIRED)
   EXECUTE_PROCESS(COMMAND "bash" "-c"
     "${WGET_EXECUTABLE} '-O' '-' \\
     'http://www.cmake.org/files/v2.4/cmake-2.4.7.tar.gz' | \\
@@ -111,14 +108,14 @@ ENDIF(NOT IRSSI_INCLUDE_DIR)
 
 SET(IRSSIOTR_INCLUDE_DIRS
   ${PROJECT_SOURCE_DIR} 
-  ${PROJECT_SOURCE_DIR}/irssi-private-headers
   ${PROJECT_BINARY_DIR} 
-  ${PROJECT_BINARY_DIR}/irssi-private-headers
   ${GLIB_INCLUDE_DIRS} 
   ${LIBOTR_INCLUDE_DIRS} 
   ${IRSSI_INCLUDE_DIR}/irssi
   ${IRSSI_INCLUDE_DIR}/irssi/src
-  ${IRSSI_INCLUDE_DIR}/irssi/src/core)
+  ${IRSSI_INCLUDE_DIR}/irssi/src/core
+  ${PROJECT_BINARY_DIR}/irssi-private-headers
+  ${PROJECT_SOURCE_DIR}/irssi-private-headers)
 
 include_directories(${IRSSIOTR_INCLUDE_DIRS})
 SET(CMAKE_REQUIRED_INCLUDES ${IRSSIOTR_INCLUDE_DIRS})
@@ -139,6 +136,9 @@ CHECK_INCLUDE_FILES("glib.h;common.h;statusbar.h" HAVE_IRSSIPRIV_H)
 IF (NOT HAVE_IRSSIPRIV_H)
   MESSAGE(STATUS "Need to fetch and patch irssi private headers "
     "mainwindows.h,statusbar.h,term.h from SVN (see irssi FS#535)")
+  IF (NOT WGET_EXECUTABLE)
+    FIND_PACKAGE(Wget REQUIRED)
+  ENDIF (NOT WGET_EXECUTABLE)
   EXECUTE_PROCESS(COMMAND "mkdir" irssi-private-headers)
   EXECUTE_PROCESS(COMMAND "bash" "-c"
     "${WGET_EXECUTABLE} '--post-data=revision=4806&root=irssi' \\
@@ -202,5 +202,5 @@ ELSEIF(CMAKE_INSTALL_TYPE MATCHES "home")
   INSTALL(TARGETS otr DESTINATION "$ENV{HOME}/.irssi/modules")
 ELSE(CMAKE_INSTALL_TYPE MATCHES "package-.*")
   INSTALL(TARGETS otr DESTINATION lib/irssi/modules)
-  INSTALL(FILES README LICENSE DESTINATION share/doc/${CMAKE_PROJECT_NAME}-${IRSSIOTR_VERSION})
+  INSTALL(FILES README LICENSE DESTINATION share/doc/${CMAKE_PROJECT_NAME})
 ENDIF(CMAKE_INSTALL_TYPE MATCHES "package-.*")
diff --git a/Packaging-DEB.cmake b/Packaging-DEB.cmake
index d1e524d..8374034 100644
--- a/Packaging-DEB.cmake
+++ b/Packaging-DEB.cmake
@@ -1,5 +1,5 @@
 INSTALL(TARGETS otr DESTINATION lib/irssi/modules)
-INSTALL(FILES README LICENSE DESTINATION share/doc/${CMAKE_PROJECT_NAME}-${IRSSIOTR_VERSION})
+INSTALL(FILES README LICENSE DESTINATION share/doc/${CMAKE_PROJECT_NAME})
 
 SET(CPACK_GENERATOR DEB)
 #SET(CPACK_DEBIAN_PACKAGE_ARCHITECTURE "amd64")
diff --git a/Packaging-RPM.cmake b/Packaging-RPM.cmake
index 31ac36d..3fe2295 100644
--- a/Packaging-RPM.cmake
+++ b/Packaging-RPM.cmake
@@ -1,5 +1,5 @@
 INSTALL(TARGETS otr DESTINATION lib/irssi/modules)
-INSTALL(FILES README DESTINATION share/doc/${CMAKE_PROJECT_NAME}-${IRSSIOTR_VERSION})
+INSTALL(FILES README DESTINATION share/doc/${CMAKE_PROJECT_NAME})
 
 SET(CPACK_GENERATOR RPM)
 SET(CPACK_RPM_PACKAGE_DEBUG)
diff --git a/Packaging.cmake b/Packaging.cmake
index 582c39c..678e06a 100644
--- a/Packaging.cmake
+++ b/Packaging.cmake
@@ -22,7 +22,7 @@ ELSEIF(CMAKE_INSTALL_TYPE STREQUAL "package-deb")
   INCLUDE(Packaging-DEB.cmake)
 ELSEIF(CMAKE_INSTALL_TYPE STREQUAL "package-tgz")
   INSTALL(TARGETS otr DESTINATION irssi/lib/modules)
-  INSTALL(FILES README LICENSE DESTINATION share/doc/${CMAKE_PROJECT_NAME}-${IRSSIOTR_VERSION})
+  INSTALL(FILES README LICENSE DESTINATION share/doc/${CMAKE_PROJECT_NAME})
 ELSE(CMAKE_INSTALL_TYPE STREQUAL "package-rpm")
   MESSAGE(FATAL_ERROR "Unknown build type '${CMAKE_INSTALL_TYPE}'")
 ENDIF(CMAKE_INSTALL_TYPE STREQUAL "package-rpm")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/irssi-plugin-otr.git