Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 159013 | Differences between
and this patch

Collapse All | Expand All

(-)zaptel-1.4.9.2.orig/Makefile (-14 / +18 lines)
Lines 382-388 Link Here
382
$(UTILSO): %.o: %.c
382
$(UTILSO): %.o: %.c
383
	$(CC) $(CFLAGS) -o $@ -c $<
383
	$(CC) $(CFLAGS) -o $@ -c $<
384
384
385
install: all devices install-modules install-programs install-firmware
385
install: devices install-modules install-programs install-firmware
386
	@echo "###################################################"
386
	@echo "###################################################"
387
	@echo "###"
387
	@echo "###"
388
	@echo "### Zaptel installed successfully."
388
	@echo "### Zaptel installed successfully."
Lines 396-405 Link Here
396
396
397
install-utils: utils install-utils-subdirs
397
install-utils: utils install-utils-subdirs
398
ifneq (,$(BINS))
398
ifneq (,$(BINS))
399
	install -d $(DESTDIR)$(BIN_DIR)
399
	$(INSTALL) -d $(DESTDIR)$(BIN_DIR)
400
	install  $(BINS) $(DESTDIR)$(BIN_DIR)/
400
	$(INSTALL)  $(BINS) $(DESTDIR)$(BIN_DIR)/
401
	install -d $(DESTDIR)$(MAN_DIR)
401
	$(INSTALL) -d $(DESTDIR)$(MAN_DIR)
402
	install -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
402
	$(INSTALL) -m 644 $(MAN_PAGES) $(DESTDIR)$(MAN_DIR)/
403
endif
403
endif
404
ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
404
ifeq (,$(wildcard $(DESTDIR)$(CONFIG_FILE)))
405
	$(INSTALL) -D -m 644 zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE)
405
	$(INSTALL) -D -m 644 zaptel.conf.sample $(DESTDIR)$(CONFIG_FILE)
Lines 407-420 Link Here
407
407
408
# Pushing those two to a separate target that is not used by default:
408
# Pushing those two to a separate target that is not used by default:
409
install-modconf:
409
install-modconf:
410
	build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)"
410
	$(INSTALL) -d -m 755 $(DESTDIR)/etc/modules.d
411
	@if [ -d /etc/modutils ]; then \
411
	build_tools/genmodconf $(BUILDVER) "$(DESTDIR)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)"
412
		/sbin/update-modules ; \
412
413
	fi
413
	#build_tools/genmodconf $(BUILDVER) "$(ROOT_PREFIX)" "$(filter-out zaptel ztdummy xpp zttranscode ztdynamic,$(BUILD_MODULES)) $(MODULE_ALIASES)"
414
	#@if [ -d /etc/modutils ]; then \
415
	#	/sbin/update-modules ; \
416
	#fi
414
417
415
install-firmware:
418
install-firmware:
416
ifeq ($(HOTPLUG_FIRMWARE),yes)
419
ifeq ($(HOTPLUG_FIRMWARE),yes)
417
	$(MAKE) -C firmware hotplug-install DESTDIR=$(DESTDIR) HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
420
	$(MAKE) -C firmware hotplug-install HOTPLUG_FIRMWARE=$(HOTPLUG_FIRMWARE)
418
endif
421
endif
419
422
420
install-libs: libs
423
install-libs: libs
Lines 422-428 Link Here
422
	$(INSTALL) -D -m 755 $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER)
425
	$(INSTALL) -D -m 755 $(LTZ_SO) $(DESTDIR)$(LIB_DIR)/$(LTZ_SO).$(LTZ_SO_MAJOR_VER).$(LTZ_SO_MINOR_VER)
423
ifeq (,$(DESTDIR))
426
ifeq (,$(DESTDIR))
424
	if [ `id -u` = 0 ]; then \
427
	if [ `id -u` = 0 ]; then \
425
		/sbin/ldconfig || : ;\
428
		/sbin/ldconfig -n $(DESTDIR)/usr/lib || : ;\
426
	fi
429
	fi
427
endif
430
endif
428
	rm -f $(DESTDIR)$(LIB_DIR)$(LTZ_SO)
431
	rm -f $(DESTDIR)$(LIB_DIR)$(LTZ_SO)
Lines 470-477 Link Here
470
	done
473
	done
471
else # DYNFS
474
else # DYNFS
472
  ifdef UDEVRULES
475
  ifdef UDEVRULES
473
	install -d $(DESTDIR)/etc/udev/rules.d
476
	$(INSTALL) -d $(DESTDIR)/etc/udev/rules.d
474
	build_tools/genudevrules > $(DESTDIR)/etc/udev/rules.d/zaptel.rules
477
	build_tools/genudevrules > zaptel.rules
478
	$(INSTALL) -D -m 644 zaptel.rules $(DESTDIR)/etc/udev/rules.d/10-zaptel.rules
475
  else # !UDEVRULES
479
  else # !UDEVRULES
476
	@echo "**** Dynamic filesystem detected -- not creating device nodes"
480
	@echo "**** Dynamic filesystem detected -- not creating device nodes"
477
  endif
481
  endif
Lines 501-507 Link Here
501
install-modules: 
505
install-modules: 
502
	$(KMAKE_INST)
506
	$(KMAKE_INST)
503
endif
507
endif
504
	[ `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
508
	[ -z "$(DESTDIR)" -a `id -u` = 0 ] && /sbin/depmod -a $(KVERS) || :
505
509
506
config:
510
config:
507
ifneq (,$(COPY_INITD))
511
ifneq (,$(COPY_INITD))

Return to bug 159013