Gentoo Attachment #142632 for bug #208815

View | Details | Raw Unified
Collapse All | Expand All

(-) udev-118.orig/extras/cdrom_id/Makefile (-4 / +9 lines)

Lines 49-55	Link Here

.PHONY: clean

.PHONY: clean

install-bin: all

install-bin: all

	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

	$(INSTALL) -d $(DESTDIR)$(libudevdir)

	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

.PHONY: install-bin

.PHONY: install-bin

uninstall-bin:

uninstall-bin:

Lines 57-62	Link Here

.PHONY: uninstall-bin

.PHONY: uninstall-bin

install-man:

install-man:

	$(INSTALL) -d $(DESTDIR)$(mandir)/man8

	$(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8

	$(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8

.PHONY: install-man

.PHONY: install-man

Lines 49-56	Link Here

.PHONY: clean

.PHONY: clean

install-bin: all

install-bin: all

	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

	$(INSTALL) -d $(DESTDIR)$(libudevdir)

	$(INSTALL_DATA) -D 60-cdrom_id.rules $(DESTDIR)$(configdir)/rules.d/60-cdrom_id.rules

	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d

	$(INSTALL_DATA) 60-cdrom_id.rules $(DESTDIR)$(configdir)/rules.d/60-cdrom_id.rules

.PHONY: install-bin

.PHONY: install-bin

uninstall-bin:

uninstall-bin:

Lines 61-67	Link Here

.PHONY: uninstall-bin

.PHONY: uninstall-bin

install-man:

install-man:

	$(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8

	$(INSTALL) -d $(DESTDIR)$(mandir)/man8

	$(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8

.PHONY: install-man

.PHONY: install-man

uninstall-man:

uninstall-man:

(-) udev-118.orig/extras/collect/Makefile (-1 / +2 lines)

Lines 44-50	Link Here

.PHONY: clean

.PHONY: clean

install-bin: all

install-bin: all

	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

	$(INSTALL) -d $(DESTDIR)$(libudevdir)

	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

.PHONY: install-bin

.PHONY: install-bin

uninstall-bin:

uninstall-bin:

(-) udev-118.orig/extras/edd_id/Makefile (-3 / +6 lines)

Lines 49-56	Link Here

.PHONY: clean

.PHONY: clean

install-bin: all

install-bin: all

	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

	$(INSTALL) -d $(DESTDIR)$(libudevdir)

	$(INSTALL_DATA) -D 61-persistent-storage-edd.rules $(DESTDIR)$(configdir)/rules.d/61-persistent-storage-edd.rules

	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

	$(INSTALL) -d $(DESTDIR)$(configdir)/rules.d/

	$(INSTALL_DATA) 61-persistent-storage-edd.rules $(DESTDIR)$(configdir)/rules.d/61-persistent-storage-edd.rules

.PHONY: install-bin

.PHONY: install-bin

uninstall-bin:

uninstall-bin:

Lines 59-65	Link Here

.PHONY: uninstall-bin

.PHONY: uninstall-bin

install-man:

install-man:

	$(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8

	$(INSTALL) -d $(DESTDIR)$(mandir)/man8

	$(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8

.PHONY: install-man

.PHONY: install-man

uninstall-man:

uninstall-man:

(-) udev-118.orig/extras/firmware/Makefile (-1 / +2 lines)

Lines 37-43	Link Here

.PHONY: clean

.PHONY: clean

install-bin: all

install-bin: all

	$(INSTALL_SCRIPT) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

	$(INSTALL) -d $(DESTDIR)$(libudevdir)

	$(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

.PHONY: install-bin

.PHONY: install-bin

uninstall-bin:

uninstall-bin:

(-) udev-118.orig/extras/floppy/Makefile (-2 / +4 lines)

Lines 49-55	Link Here

.PHONY: clean

.PHONY: clean

install-bin: all

install-bin: all

	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

	$(INSTALL) -d $(DESTDIR)$(libudevdir)

	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

.PHONY: install-bin

.PHONY: install-bin

uninstall-bin:

uninstall-bin:

Lines 57-63	Link Here

.PHONY: uninstall-bin

.PHONY: uninstall-bin

install-man:

install-man:

	$(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8

	$(INSTALL) -d $(DESTDIR)$(mandir)/man8/

	$(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8

.PHONY: install-man

.PHONY: install-man

uninstall-man:

uninstall-man:

(-) udev-118.orig/extras/path_id/Makefile (-2 / +4 lines)

Lines 37-43	Link Here

.PHONY: clean

.PHONY: clean

install-bin: all

install-bin: all

	$(INSTALL_SCRIPT) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

	$(INSTALL) -d $(DESTDIR)$(libudevdir)

	$(INSTALL_SCRIPT) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

.PHONY: install-bin

.PHONY: install-bin

uninstall-bin:

uninstall-bin:

Lines 45-51	Link Here

.PHONY: uninstall-bin

.PHONY: uninstall-bin

install-man:

install-man:

	$(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8

	$(INSTALL) -d $(DESTDIR)$(mandir)/man8/

	$(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8

.PHONY: install-man

.PHONY: install-man

uninstall-man:

uninstall-man:

(-) udev-118.orig/extras/rule_generator/Makefile (-5 / +7 lines)

Lines 37-48	Link Here

.PHONY: clean

.PHONY: clean

install-bin: all

install-bin: all

	$(INSTALL_DATA) -D rule_generator.functions $(DESTDIR)$(libudevdir)/rule_generator.functions

	$(INSTALL) -d $(DESTDIR)$(libudevdir)

	$(INSTALL_SCRIPT) -D write_cd_rules $(DESTDIR)$(libudevdir)/write_cd_rules

	$(INSTALL_DATA) rule_generator.functions $(DESTDIR)$(libudevdir)/rule_generator.functions

	$(INSTALL_SCRIPT) -D write_net_rules $(DESTDIR)$(libudevdir)/write_net_rules

	$(INSTALL_SCRIPT) write_cd_rules $(DESTDIR)$(libudevdir)/write_cd_rules

	$(INSTALL_DATA) -D 75-cd-aliases-generator.rules \

	$(INSTALL_SCRIPT) write_net_rules $(DESTDIR)$(libudevdir)/write_net_rules

	$(INSTALL) -d  $(DESTDIR)$(configdir)/rules.d

	$(INSTALL_DATA) 75-cd-aliases-generator.rules \

		$(DESTDIR)$(configdir)/rules.d/75-cd-aliases-generator.rules

		$(DESTDIR)$(configdir)/rules.d/75-cd-aliases-generator.rules

	$(INSTALL_DATA) -D 75-persistent-net-generator.rules \

	$(INSTALL_DATA) 75-persistent-net-generator.rules \

		$(DESTDIR)$(configdir)/rules.d/75-persistent-net-generator.rules

		$(DESTDIR)$(configdir)/rules.d/75-persistent-net-generator.rules

.PHONY: install-bin

.PHONY: install-bin

(-) udev-118.orig/extras/scsi_id/Makefile (-4 / +8 lines)

Lines 58-64	Link Here

.PHONY: clean

.PHONY: clean

install-bin: all

install-bin: all

	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

	$(INSTALL) -d $(DESTDIR)$(libudevdir)

	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

.PHONY: install-bin

.PHONY: install-bin

uninstall-bin:

uninstall-bin:

Lines 66-72	Link Here

.PHONY: uninstall-bin

.PHONY: uninstall-bin

install-man:

install-man:

	$(INSTALL_DATA) -D scsi_id.8 $(DESTDIR)$(mandir)/man8/scsi_id.8

	$(INSTALL) -d $(DESTDIR)$(mandir)/man8

	$(INSTALL_DATA) scsi_id.8 $(DESTDIR)$(mandir)/man8/scsi_id.8

.PHONY: install-man

.PHONY: install-man

uninstall-man:

uninstall-man:

Lines 75-82	Link Here

install-config:

install-config:

	@ if [ ! -r $(DESTDIR)$(etcdir)/scsi_id.config ]; then \

	@ if [ ! -r $(DESTDIR)$(etcdir)/scsi_id.config ]; then \

		echo $(INSTALL_DATA) -D ./scsi_id.config  $(DESTDIR)$(etcdir); \

		echo $(INSTALL) -d $(DESTDIR)$(etcdir); \

		$(INSTALL_DATA) -D ./scsi_id.config $(DESTDIR)$(etcdir)/scsi_id.config; \

		echo $(INSTALL_DATA) ./scsi_id.config  $(DESTDIR)$(etcdir); \

		$(INSTALL) -d $(DESTDIR)$(etcdir); \

		$(INSTALL_DATA) ./scsi_id.config $(DESTDIR)$(etcdir)/scsi_id.config; \

fi

fi

.PHONY: install-config

.PHONY: install-config

(-) udev-118.orig/extras/usb_id/Makefile (-1 / +2 lines)

Lines 49-55	Link Here

.PHONY: clean

.PHONY: clean

install-bin: all

install-bin: all

	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

	$(INSTALL) -d $(DESTDIR)$(libudevdir)

	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

.PHONY: install-bin

.PHONY: install-bin

uninstall-bin:

uninstall-bin:

(-) udev-118.orig/extras/volume_id/lib/Makefile (-4 / +7 lines)

Lines 101-116	Link Here

	$(Q) echo "Cflags: -I\$${includedir}" >> $@

	$(Q) echo "Cflags: -I\$${includedir}" >> $@

install: all

install: all

	$(INSTALL_DATA) -D libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h

	$(INSTALL) -d $(DESTDIR)$(includedir)

	$(INSTALL_LIB) -D $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)

	$(INSTALL_DATA) libvolume_id.h $(DESTDIR)$(includedir)/libvolume_id.h

	mkdir -p $(DESTDIR)$(usrlibdir)/

	$(INSTALL) -d $(DESTDIR)$(libdir)

	$(INSTALL_LIB) $(SHLIB) $(DESTDIR)$(libdir)/$(SHLIB)

	$(INSTALL) -d $(DESTDIR)$(usrlibdir)

	ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)

	ln -sf $(SHLIB) $(DESTDIR)$(libdir)/libvolume_id.so.$(SHLIB_CUR)

ifeq ($(libdir),$(usrlibdir))

ifeq ($(libdir),$(usrlibdir))

	ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so

	ln -sf $(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so

else

else

	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so

	ln -sf $(libdir)/$(SHLIB) $(DESTDIR)$(usrlibdir)/libvolume_id.so

endif

endif

	$(INSTALL_DATA) -D libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc

	$(INSTALL) -d $(DESTDIR)$(usrlibdir)/pkgconfig

	$(INSTALL_DATA) libvolume_id.pc $(DESTDIR)$(usrlibdir)/pkgconfig/libvolume_id.pc

.PHONY: install

.PHONY: install

uninstall:

uninstall:

(-) udev-118.orig/extras/volume_id/Makefile (-2 / +4 lines)

Lines 60-66	Link Here

.PHONY: clean

.PHONY: clean

install-bin: all

install-bin: all

	$(INSTALL_PROGRAM) -D $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

	$(INSTALL) -d $(DESTDIR)$(libudevdir)

	$(INSTALL_PROGRAM) $(PROG) $(DESTDIR)$(libudevdir)/$(PROG)

	$(MAKE) -C lib install

	$(MAKE) -C lib install

.PHONY: install-bin

.PHONY: install-bin

Lines 70-76	Link Here

.PHONY: uninstall-bin

.PHONY: uninstall-bin

install-man:

install-man:

	$(INSTALL_DATA) -D $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8

	$(INSTALL) -d $(DESTDIR)$(mandir)/man8

	$(INSTALL_DATA) $(PROG).8 $(DESTDIR)$(mandir)/man8/$(PROG).8

.PHONY: install-man

.PHONY: install-man

uninstall-man:

uninstall-man:

(-) udev-118.orig/Makefile (-7 / +9 lines)

Lines 236-244	Link Here

.PHONY: install-config

.PHONY: install-config

install-man:

install-man:

	$(INSTALL_DATA) -D udev.7 $(DESTDIR)$(mandir)/man7/udev.7

	$(INSTALL) -d $(DESTDIR)$(mandir)/man7

	$(INSTALL_DATA) -D udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8

	$(INSTALL_DATA) udev.7 $(DESTDIR)$(mandir)/man7/udev.7

	$(INSTALL_DATA) -D udevadm.8 $(DESTDIR)$(mandir)/man8/udevadm.8

	$(INSTALL) -d $(DESTDIR)$(mandir)/man8

	$(INSTALL_DATA) udevd.8 $(DESTDIR)$(mandir)/man8/udevd.8

	$(INSTALL_DATA) udevadm.8 $(DESTDIR)$(mandir)/man8/udevadm.8

	ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevinfo.8

	ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevinfo.8

	ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevtest.8

	ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevtest.8

	ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevtrigger.8

	ln -f -s udevadm.8 $(DESTDIR)$(mandir)/man8/udevtrigger.8

Lines 266-278	Link Here

.PHONY: uninstall-man

.PHONY: uninstall-man

install-bin:

install-bin:

	$(INSTALL) -d $(DESTDIR)$(udevdir)

	$(INSTALL) -d $(DESTDIR)$(sbindir)

	$(INSTALL_PROGRAM) -D udevd $(DESTDIR)$(sbindir)/udevd

	$(INSTALL_PROGRAM) udevd $(DESTDIR)$(sbindir)/udevd

	$(INSTALL_PROGRAM) -D udevadm $(DESTDIR)$(sbindir)/udevadm

	$(INSTALL_PROGRAM) udevadm $(DESTDIR)$(sbindir)/udevadm

	ln -f -s udevadm $(DESTDIR)$(sbindir)/udevtrigger

	ln -f -s udevadm $(DESTDIR)$(sbindir)/udevtrigger

	ln -f -s udevadm $(DESTDIR)$(sbindir)/udevsettle

	ln -f -s udevadm $(DESTDIR)$(sbindir)/udevsettle

	ln -f -s udevadm $(DESTDIR)$(sbindir)/udevcontrol

	ln -f -s udevadm $(DESTDIR)$(sbindir)/udevcontrol

	mkdir -p -m 0755 $(DESTDIR)$(usrsbindir)

	$(INSTALL) -d $(DESTDIR)$(usrsbindir)

	ln -f -s $(sbindir)/udevadm $(DESTDIR)$(usrsbindir)/udevmonitor

	ln -f -s $(sbindir)/udevadm $(DESTDIR)$(usrsbindir)/udevmonitor

	mkdir -p -m 0755 $(DESTDIR)$(usrbindir)

	mkdir -p -m 0755 $(DESTDIR)$(usrbindir)

	ln -f -s $(sbindir)/udevadm $(DESTDIR)$(usrbindir)/udevinfo

	ln -f -s $(sbindir)/udevadm $(DESTDIR)$(usrbindir)/udevinfo

Attachment #142632: Don't use install -D for bug #208815