[Debburn-changes] r756 - in cdrkit/trunk: . genisoimage icedax
include readom wodim
Eduard Bloch
blade at alioth.debian.org
Thu May 3 10:27:25 UTC 2007
Author: blade
Date: 2007-05-03 10:27:24 +0000 (Thu, 03 May 2007)
New Revision: 756
Modified:
cdrkit/trunk/Changelog
cdrkit/trunk/INSTALL
cdrkit/trunk/Makefile
cdrkit/trunk/genisoimage/CMakeLists.txt
cdrkit/trunk/icedax/CMakeLists.txt
cdrkit/trunk/include/AddSchilyBits.cmake
cdrkit/trunk/readom/CMakeLists.txt
cdrkit/trunk/wodim/CMakeLists.txt
Log:
MANSUBDIR integration, libossaudio detection in icedax
Modified: cdrkit/trunk/Changelog
===================================================================
--- cdrkit/trunk/Changelog 2007-05-03 10:20:54 UTC (rev 755)
+++ cdrkit/trunk/Changelog 2007-05-03 10:27:24 UTC (rev 756)
@@ -4,6 +4,11 @@
* 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 <blade at debian.org> Thu, 03 May 2007 11:54:45 +0200
cdrkit (1.1.5.1) RELEASED; urgency=low
Modified: cdrkit/trunk/INSTALL
===================================================================
--- cdrkit/trunk/INSTALL 2007-05-03 10:20:54 UTC (rev 755)
+++ cdrkit/trunk/INSTALL 2007-05-03 10:27:24 UTC (rev 756)
@@ -20,16 +20,12 @@
Run: make install
-To force a custom target directory, use something like:
+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)
-make install PREFIX=/opt/cdrkit
-
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
Modified: cdrkit/trunk/Makefile
===================================================================
--- cdrkit/trunk/Makefile 2007-05-03 10:20:54 UTC (rev 755)
+++ cdrkit/trunk/Makefile 2007-05-03 10:27:24 UTC (rev 756)
@@ -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)
Modified: cdrkit/trunk/genisoimage/CMakeLists.txt
===================================================================
--- cdrkit/trunk/genisoimage/CMakeLists.txt 2007-05-03 10:20:54 UTC (rev 755)
+++ cdrkit/trunk/genisoimage/CMakeLists.txt 2007-05-03 10:27:24 UTC (rev 756)
@@ -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")
Modified: cdrkit/trunk/icedax/CMakeLists.txt
===================================================================
--- cdrkit/trunk/icedax/CMakeLists.txt 2007-05-03 10:20:54 UTC (rev 755)
+++ cdrkit/trunk/icedax/CMakeLists.txt 2007-05-03 10:27:24 UTC (rev 756)
@@ -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)
Modified: cdrkit/trunk/include/AddSchilyBits.cmake
===================================================================
--- cdrkit/trunk/include/AddSchilyBits.cmake 2007-05-03 10:20:54 UTC (rev 755)
+++ cdrkit/trunk/include/AddSchilyBits.cmake 2007-05-03 10:27:24 UTC (rev 756)
@@ -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)
Modified: cdrkit/trunk/readom/CMakeLists.txt
===================================================================
--- cdrkit/trunk/readom/CMakeLists.txt 2007-05-03 10:20:54 UTC (rev 755)
+++ cdrkit/trunk/readom/CMakeLists.txt 2007-05-03 10:27:24 UTC (rev 756)
@@ -16,4 +16,4 @@
INSTALL(TARGETS readom DESTINATION bin)
INSTALL(FILES
readom.1
-DESTINATION share/man/man1)
+DESTINATION ${MANSUBDIR}/man1)
Modified: cdrkit/trunk/wodim/CMakeLists.txt
===================================================================
--- cdrkit/trunk/wodim/CMakeLists.txt 2007-05-03 10:20:54 UTC (rev 755)
+++ cdrkit/trunk/wodim/CMakeLists.txt 2007-05-03 10:27:24 UTC (rev 756)
@@ -34,4 +34,4 @@
INSTALL(TARGETS wodim DESTINATION bin)
INSTALL(FILES
wodim.1
-DESTINATION share/man/man1)
+DESTINATION ${MANSUBDIR}/man1)
More information about the Debburn-changes
mailing list