man: spelling fix

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d8b1889c222383197f96baeba279c5aaef5919bd..acad5eca185ef9b83cfb18daea46dce7bafd4d67 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
 
 SUBDIRS = .
 
-EXTRA_DIST = autogen.sh
+EXTRA_DIST =
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
@@ -61,6 +61,7 @@ libudev_libudev_la_SOURCES =\
        libudev/libudev-queue.c
 
 libudev_libudev_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
        -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
 noinst_LTLIBRARIES = \
@@ -113,14 +114,16 @@ EXTRA_DIST += \
 udevrulesdir = $(libexecdir)/rules.d
 dist_udevrules_DATA = \
        rules/rules.d/50-udev-default.rules \
-       rules/rules.d/60-persistent-storage.rules \
        rules/rules.d/60-persistent-storage-tape.rules \
        rules/rules.d/60-persistent-serial.rules \
        rules/rules.d/60-persistent-input.rules \
        rules/rules.d/60-persistent-alsa.rules \
-       rules/rules.d/80-drivers.rules \
        rules/rules.d/95-udev-late.rules
 
+udevrules_DATA = \
+       rules/rules.d/60-persistent-storage.rules \
+       rules/rules.d/80-drivers.rules
+
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = udev.conf
 
@@ -129,15 +132,15 @@ sharepkgconfig_DATA = udev/udev.pc
 
 if WITH_SYSTEMD
 systemdsystemunit_DATA = \
-       init/udev-control.socket \
-       init/udev-kernel.socket \
-       init/udev.service \
-       init/udev-trigger.service \
-       init/udev-settle.service
+       systemd/udev-control.socket \
+       systemd/udev-kernel.socket \
+       systemd/udev.service \
+       systemd/udev-trigger.service \
+       systemd/udev-settle.service
 
 EXTRA_DIST += \
-       init/udev-control.socket \
-       init/udev-kernel.socket
+       systemd/udev-control.socket \
+       systemd/udev-kernel.socket
 
 systemd-install-hook:
        mkdir -p $(DESTDIR)$(systemdsystemunitdir)/sockets.target.wants
@@ -150,10 +153,12 @@ systemd-install-hook:
 INSTALL_DATA_HOOKS += systemd-install-hook
 endif
 
-sbin_PROGRAMS = \
-       udev/udevd \
+bin_PROGRAMS = \
        udev/udevadm
 
+libexec_PROGRAMS = \
+       udev/udevd
+
 udev_common_sources =\
        udev/udev.h \
        udev/udev-event.c \
@@ -233,7 +238,7 @@ extras_firmware_firmware_SOURCES = extras/firmware/firmware.c
 extras_firmware_firmware_LDADD = libudev/libudev-private.la
 extras_firmware_firmware_CPPFLAGS = $(AM_CPPFLAGS) -DFIRMWARE_PATH="$(FIRMWARE_PATH)"
 dist_udevrules_DATA += extras/firmware/50-firmware.rules
-libexec_PROGRAMS = extras/firmware/firmware
+libexec_PROGRAMS += extras/firmware/firmware
 
 # ------------------------------------------------------------------------------
 # ata_id - ATA identify
@@ -296,7 +301,7 @@ if ENABLE_GUDEV
 # GUdev - libudev gobject interface
 # ------------------------------------------------------------------------------
 LIBGUDEV_CURRENT=1
-LIBGUDEV_REVISION=0
+LIBGUDEV_REVISION=1
 LIBGUDEV_AGE=1
 
 SUBDIRS += extras/gudev/docs
@@ -677,9 +682,14 @@ git-release:
        head -1 ChangeLog | grep -q "to v$(VERSION)"
        head -1 NEWS | grep -q "udev $(VERSION)"
        git commit -a -m "release $(VERSION)"
-       git tag $(VERSION)
+       git tag -m "udev $(VERSION)" -s $(VERSION)
        git gc --prune=0
 
+tar:
+       make distcheck
+       gpg --armor --detach-sign udev-$(VERSION).tar.gz
+       gpg --armor --detach-sign udev-$(VERSION).tar.bz2
+
 git-sync:
        git push
        git push --tags $(VERSION)