2
0
peter 22 жил өмнө
parent
commit
fe56bb4b4c

+ 2 - 5
packages/extra/cdrom/Makefile

@@ -209,13 +209,10 @@ override TARGET_UNITS+=cdrom discid
 ifeq ($(OS_TARGET),linux)
 ifeq ($(OS_TARGET),linux)
 override TARGET_IMPLICITUNITS+=major lincd
 override TARGET_IMPLICITUNITS+=major lincd
 endif
 endif
-override TARGET_EXAMPLES+=showcds getdiscid
-ifeq ($(OS_TARGET),linux)
-override INSTALL_UNITS+=lincd major
-endif
 ifeq ($(OS_TARGET),win32)
 ifeq ($(OS_TARGET),win32)
-override INSTALL_UNITS+=scsidefs wnaspi32 cdromioctl wincd
+override TARGET_IMPLICITUNITS+=scsidefs wnaspi32 cdromioctl wincd
 endif
 endif
+override TARGET_EXAMPLES+=showcds getdiscid
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCPACKAGE=y
 ifdef REQUIRE_UNITSDIR
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
 override UNITSDIR+=$(REQUIRE_UNITSDIR)

+ 1 - 2
packages/extra/cdrom/Makefile.fpc

@@ -8,13 +8,12 @@ version=1.0.8
 
 
 [target]
 [target]
 units=cdrom discid
 units=cdrom discid
+implicitunits_win32=scsidefs wnaspi32 cdromioctl wincd
 implicitunits_linux=major lincd
 implicitunits_linux=major lincd
 examples=showcds getdiscid
 examples=showcds getdiscid
 
 
 [install]
 [install]
 fpcpackage=y
 fpcpackage=y
-units_win32=scsidefs wnaspi32 cdromioctl wincd
-units_linux=lincd major
 
 
 [default]
 [default]
 fpcdir=../../..
 fpcdir=../../..