chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mount: add nosuid,nodev,noexec switches to /var/lock and /var/run
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 77d1fc938ffcf3f2d4cfa6a2e917d1e5e9a99f3b..a55b244b6719e0605c0b099dc7be788e99df7c53 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-303,19
+303,13
@@
dist_systemunit_DATA += \
units/fedora/plymouth-halt.service
endif
units/fedora/plymouth-halt.service
endif
-if TARGET_DEBIAN
+if TARGET_DEBIAN
_OR_UBUNTU
dist_systemunit_DATA += \
dist_systemunit_DATA += \
- units/debian/fsck.target \
units/debian/umountfs.service \
units/debian/umountnfs.service \
units/debian/umountroot.service
endif
units/debian/umountfs.service \
units/debian/umountnfs.service \
units/debian/umountroot.service
endif
-if TARGET_SUSE
-dist_systemunit_DATA += \
- units/suse/fsck.target
-endif
-
if TARGET_GENTOO
dist_systemunit_DATA += \
units/gentoo/xdm.service
if TARGET_GENTOO
dist_systemunit_DATA += \
units/gentoo/xdm.service
@@
-323,7
+317,6
@@
endif
if TARGET_ARCH
dist_systemunit_DATA += \
if TARGET_ARCH
dist_systemunit_DATA += \
- units/arch/sysinit.service \
units/arch/rc-local.service
endif
units/arch/rc-local.service
endif
@@
-1218,7
+1211,7
@@
if TARGET_GENTOO
rm -f xdm.service && \
$(LN_S) $(systemunitdir)/xdm.service xdm.service )
endif
rm -f xdm.service && \
$(LN_S) $(systemunitdir)/xdm.service xdm.service )
endif
-if TARGET_DEBIAN
+if TARGET_DEBIAN
_OR_UBUNTU
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir)/umount.target.wants
( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
$(MKDIR_P) -m 0755 \
$(DESTDIR)$(systemunitdir)/umount.target.wants
( cd $(DESTDIR)$(systemunitdir)/umount.target.wants && \
@@
-1230,13
+1223,6
@@
if TARGET_DEBIAN
rm -f runlevel5.target && \
$(LN_S) multi-user.target runlevel5.target )
endif
rm -f runlevel5.target && \
$(LN_S) multi-user.target runlevel5.target )
endif
-if !TARGET_SUSE
-if !TARGET_DEBIAN
- ( cd $(DESTDIR)$(systemunitdir) && \
- rm -f fsck.target && \
- $(LN_S) sysinit.target fsck.target )
-endif
-endif
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \