[Debburn-devel] cdrkit-1.1.2 change requests

[Eduard Bloch]

#include <hallo.h>
* Thomas Klausner [Fri, Feb 23 2007, 08:42:50PM]:
> Hi!
> 
> I have two requests for cdrkit-1.1.2:
> . On NetBSD, the native sound system is similar to the
>   SUN one, but there is a OSS compatibility library.  When using
>   the sys/soundcard.h interface on NetBSD, one needs to link against
>   -lossaudio. Could someone please fix icedax/CMakeLists.txt so
>   this happens? I'm currently using the attached patch, but this
>   is probably not correct for non-NetBSD.
> . Many CMakeLists.txt files[1] have "share/man" hardcoded;
>   in NetBSD pkgsrc we prefer ${PREFIX}/man for manpages. Could
>   this setting be centralized and be made overridable? Or am I
>   overlooking an easy way to override it as it is?

Please test the attached patch, applied to 1.5.1 or so. It should do
what you need with "make install MANSUBDIR=man".

Eduard.
-- 
Niemand ist weiter von der wahren Religion entfernt, als wer sich
selbst für sehr religiös hält.
		-- Desiderius Erasmus von Rotterdam
-------------- next part --------------
Index: wodim/CMakeLists.txt
===================================================================
--- wodim/CMakeLists.txt	(Revision 752)
+++ wodim/CMakeLists.txt	(Arbeitskopie)
@@ -34,4 +34,4 @@
 INSTALL(TARGETS wodim DESTINATION bin)
 INSTALL(FILES 
    wodim.1
-DESTINATION share/man/man1)
+DESTINATION ${MANSUBDIR}/man1)
Index: include/AddSchilyBits.cmake
===================================================================
--- include/AddSchilyBits.cmake	(Revision 752)
+++ include/AddSchilyBits.cmake	(Arbeitskopie)
@@ -3,7 +3,11 @@
 
    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)
 
Index: genisoimage/CMakeLists.txt
===================================================================
--- genisoimage/CMakeLists.txt	(Revision 752)
+++ genisoimage/CMakeLists.txt	(Arbeitskopie)
@@ -61,5 +61,5 @@
 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")
Index: icedax/CMakeLists.txt
===================================================================
--- icedax/CMakeLists.txt	(Revision 752)
+++ icedax/CMakeLists.txt	(Arbeitskopie)
@@ -10,7 +10,11 @@
 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 @@
 
 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)
 
Index: readom/CMakeLists.txt
===================================================================
--- readom/CMakeLists.txt	(Revision 752)
+++ readom/CMakeLists.txt	(Arbeitskopie)
@@ -16,4 +16,4 @@
 INSTALL(TARGETS readom DESTINATION bin)
 INSTALL(FILES 
 readom.1
-DESTINATION share/man/man1)
+DESTINATION ${MANSUBDIR}/man1)
Index: Makefile
===================================================================
--- Makefile	(Revision 752)
+++ Makefile	(Arbeitskopie)
@@ -10,6 +10,10 @@
 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)