MANSUBDIR integration, libossaudio detection in icedax

git-svn-id: svn://svn.debian.org/debburn/cdrkit/trunk@756 a95a6be8-091b-0410-adaf-d31e6857962f

Changelog

@@ -4,6 +4,11 @@ cdrkit (1.1.6) UNRELEASED; urgency=low
   * genisoimage/eltorito.c: care about inhibit flags when preparing eltority
     boot catalog directory entry, avoiding possible crashes
 
+  [ Eduard Bloch]
+  * ALL: customize the base manpage subdirectory below PREFIX using the new
+    MANSUBDIR variable
+  * icedax: find libossaudio on OpenBSD and use it
+
  -- Eduard Bloch <[email protected]>  Thu, 03 May 2007 11:54:45 +0200
 
 cdrkit (1.1.5.1) RELEASED; urgency=low

INSTALL

@@ -20,16 +20,12 @@ INSTALLATION:
 
 Run: make install
 
-To force a custom target directory, use something like:
-
-make install PREFIX=/opt/cdrkit
+To customize the target paths, some variables can be appended to this line:
+PREFIX=/opt/cdrkit/latest (default: CMake preset, e.g. /usr/local)
+MANSUBDIR=man (default: share/man)
 
 TROUBLESHOOTING:
 
-Problem: "make install" uses the wrong target directory and appends /usr/local
-  to it.
-Solution: override the complete target path with PREFIX=... (see above)
-
 Problem: Linking error.
 Solution: Look for missing dependencies. If you installed additional libraries
 in non-system paths, they may have a conflict with the system libraries which

Makefile

@@ -10,6 +10,10 @@ ifneq ($(PREFIX),)
 CMAKETWEAKS += ( cd build ;  cmake .. -DCMAKE_INSTALL_PREFIX="$(PREFIX)") || exit 1; 
 endif
 
+ifneq ($(MANSUBDIR),)
+CMAKETWEAKS += ( cd build ;  cmake .. -DMANSUBDIR="$(MANSUBDIR)" ) || exit 1; 
+endif
+
 default_target: all
 
 DISTNAME=cdrkit-$(shell cat VERSION)

genisoimage/CMakeLists.txt

@@ -61,5 +61,5 @@ diag/isodebug.1
 diag/isodump.1
 diag/isoinfo.1
 diag/isovfy.1
-DESTINATION share/man/man1)
-INSTALL(FILES genisoimagerc.5 DESTINATION share/man/man5)
+DESTINATION ${MANSUBDIR}/man1)
+INSTALL(FILES genisoimagerc.5 DESTINATION "${MANSUBDIR}/man5")

icedax/CMakeLists.txt

@@ -10,7 +10,11 @@ IF(HAVE_SYS_SOUNDCARD_H)
 ENDIF(HAVE_SYS_SOUNDCARD_H)
 FIND_FILE (HAVE_LINUX_SOUNDCARD_H linux/soundcard.h)
 IF(HAVE_LINUX_SOUNDCARD_H)
-   	ADD_DEFINITIONS(-DHAVE_LINUX_SOUNDCARD_H)
+    ADD_DEFINITIONS(-DHAVE_LINUX_SOUNDCARD_H)
+    FIND_LIBRARY(HAVE_LIBOSSAUDIO "ossaudio")
+    IF(HAVE_LIBOSSAUDIO)
+        LIST(APPEND EXTRA_LIBS "ossaudio")
+    ENDIF(HAVE_LIBOSSAUDIO)
 ENDIF(HAVE_LINUX_SOUNDCARD_H)
 
 LIST(APPEND EXTRA_LIBS  paranoia)
@@ -25,5 +29,5 @@ SET_TARGET_PROPERTIES(icedax PROPERTIES  SKIP_BUILD_RPATH TRUE)
 
 INSTALL(TARGETS icedax DESTINATION bin)
 INSTALL(PROGRAMS pitchplay readmult cdda2mp3 cdda2ogg DESTINATION bin)
-INSTALL(FILES cdda2ogg.1 icedax.1 pitchplay.1 readmult.1 list_audio_tracks.1 DESTINATION share/man/man1)
+INSTALL(FILES cdda2ogg.1 icedax.1 pitchplay.1 readmult.1 list_audio_tracks.1 DESTINATION ${MANSUBDIR}/man1)
 

include/AddSchilyBits.cmake

@@ -3,7 +3,11 @@ IF(NOT CHECKED_rols)
 
    LIST(APPEND EXTRA_LIBS "rols")
 
-# not the proper place but ok, because it is linked from everywhere
+# abuse this include file to make sure the target is set
+
+   IF(NOT MANSUBDIR)
+      SET(MANSUBDIR "share/man")
+   ENDIF(NOT MANSUBDIR)
 
 ENDIF(NOT CHECKED_rols)
 

readom/CMakeLists.txt

@@ -16,4 +16,4 @@ SET_TARGET_PROPERTIES(readom PROPERTIES  SKIP_BUILD_RPATH TRUE)
 INSTALL(TARGETS readom DESTINATION bin)
 INSTALL(FILES 
 readom.1
-DESTINATION share/man/man1)
+DESTINATION ${MANSUBDIR}/man1)

wodim/CMakeLists.txt

@@ -34,4 +34,4 @@ SET_TARGET_PROPERTIES(wodim PROPERTIES SKIP_BUILD_RPATH TRUE)
 INSTALL(TARGETS wodim DESTINATION bin)
 INSTALL(FILES 
    wodim.1
-DESTINATION share/man/man1)
+DESTINATION ${MANSUBDIR}/man1)