aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile53
1 files changed, 31 insertions, 22 deletions
diff --git a/Makefile b/Makefile
index 7d1eff56..576992ed 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,10 @@ install:
install -m644 inittab $(ROOT)/etc
install -m644 rwtab statetab networks $(ROOT)/etc
install -m755 service $(ROOT)/usr/sbin
- install -m644 lang.csh lang.sh $(ROOT)/etc/profile.d
- install -m644 256term.csh 256term.sh $(ROOT)/etc/profile.d
+ install -m644 lang.csh $(ROOT)/etc/profile.d/10-lang.csh
+ install -m644 lang.sh $(ROOT)/etc/profile.d/10-lang.sh
+ install -m644 256term.csh $(ROOT)/etc/profile.d/10-256term.csh
+ install -m644 256term.sh $(ROOT)/etc/profile.d/10-256term.sh
install -m644 debug.csh debug.sh $(ROOT)/etc/profile.d
install -m755 sys-unconfig $(ROOT)/usr/sbin
install -m644 service.8 sys-unconfig.8 $(ROOT)$(mandir)/man8
@@ -38,13 +40,22 @@ install:
install -m 644 sysctl.conf.README $(ROOT)/etc/sysctl.conf
ln -s ../sysctl.conf $(ROOT)/etc/sysctl.d/99-sysctl.conf
+ mkdir -p $(ROOT)/etc/X11
+ install -m755 prefdm $(ROOT)/etc/X11/prefdm
+ mkdir -p $(ROOT)/usr/bin
+ install -m755 display-manager-failure-message $(ROOT)/usr/bin/display-manager-failure-message
+
install -m755 -d $(ROOT)/etc/rc.d $(ROOT)/etc/sysconfig
cp -af rc.d/init.d $(ROOT)/etc/rc.d/
install -m644 sysconfig/debug sysconfig/init sysconfig/netconsole sysconfig/readonly-root $(ROOT)/etc/sysconfig/
cp -af sysconfig/network-scripts $(ROOT)/etc/sysconfig/
cp -af ppp NetworkManager $(ROOT)/etc
+ # (cg) Are the two lines below needed these days???
+ mkdir -p $(ROOT)/etc/sysconfig/console/consolefonts
+ mkdir -p $(ROOT)/etc/sysconfig/console/consoletrans
mkdir -p $(ROOT)/usr/lib/systemd/
cp -af systemd/* $(ROOT)/usr/lib/systemd/
+ chmod 755 $(ROOT)/usr/lib/systemd/mandriva-*
mkdir -p $(ROOT)/etc/ppp/peers
mkdir -p $(ROOT)/usr/lib
cp -af udev $(ROOT)/usr/lib
@@ -65,8 +76,6 @@ install:
mv $(ROOT)/etc/sysconfig/network-scripts/ifup $(ROOT)/usr/sbin
mv $(ROOT)/etc/sysconfig/network-scripts/ifdown $(ROOT)/usr/sbin
(cd $(ROOT)/etc/sysconfig/network-scripts; \
- ln -sf ifup-ippp ifup-isdn ; \
- ln -sf ifdown-ippp ifdown-isdn ; \
ln -sf ../../../usr/sbin/ifup . ; \
ln -sf ../../../usr/sbin/ifdown . )
make install ROOT=$(ROOT) mandir=$(mandir) -C src
@@ -84,6 +93,13 @@ install:
mkdir $$dir; \
chmod u=rwx,g=rx,o=rx $$dir; \
done
+ # install translated man pages
+ for j in 1 3 8 ; do \
+ for i in man/??* ; do \
+ install -d $(ROOT)$(mandir)/`basename $$i`/man$$j ; \
+ install -m 644 $$i/*.$$j $(ROOT)$(mandir)/`basename $$i`/man$$j ; \
+ done ; \
+ done
# Can't store symlinks in a CVS archive
mkdir -p -m 755 $(ROOT)/usr/lib/systemd/system/multi-user.target.wants
@@ -97,33 +113,36 @@ install:
ln -s ../fedora-autorelabel-mark.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
ln -s ../fedora-readonly.service $(ROOT)/usr/lib/systemd/system/local-fs.target.wants
ln -s ../fedora-import-state.service $(ROOT)/usr/lib/systemd/system/local-fs.target.wants
+ ln -s ../mandriva-kmsg-loglevel.service $(ROOT)/usr/lib/systemd/system/sysinit.target.wants
+ ln -s ../mandriva-save-dmesg.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
+ ln -s ../mandriva-everytime.service $(ROOT)/usr/lib/systemd/system/basic.target.wants
mkdir -p $(ROOT)/usr/lib/tmpfiles.d
install -m 644 initscripts.tmpfiles.d $(ROOT)/usr/lib/tmpfiles.d/initscripts.conf
+ install -m 644 mandriva.tmpfiles.d $(ROOT)/usr/lib/tmpfiles.d/mandriva.conf
# These are LSB compatibility symlinks. At some point in the future
# the actual files will be here instead of symlinks
- for i in 0 1 2 3 4 5 6 ; do \
+ for i in 0 1 2 3 4 5 6 S ; do \
ln -s rc.d/rc$$i.d $(ROOT)/etc/rc$$i.d; \
done
mkdir -p -m 755 $(ROOT)/usr/libexec/initscripts/legacy-actions
-
syntax-check:
- for afile in `find . -type f -perm +111|grep -v \.csh | grep -v .git | grep -v po/ ` ; do \
- if ! file $$afile | grep -s ELF >/dev/null; then \
+ for afile in `find . -type f -perm +111|grep -v \.csh | grep -v .git | grep -v po/ | grep -v 'gprintify.py' ` ; do \
+ if ! file $$afile | grep -s ELF >/dev/null && ! file $$afile | grep -s perl >/dev/null; then \
bash -n $$afile || { echo $$afile ; exit 1 ; } ; \
fi ;\
done
+ make -C mandriva check
check: syntax-check
make check -C src
make clean -C src
changelog:
- @rm -f ChangeLog
- git log --stat > ChangeLog
+ make -C mandriva changelog
clean:
make clean -C src
@@ -132,17 +151,7 @@ clean:
@find . -name "*~" -exec rm -v -f {} \;
tag:
- @git tag -a -f -m "Tag as $(TAG)" $(TAG)
- @echo "Tagged as $(TAG)"
+ @make -C mandriva cvstag
archive: clean syntax-check tag changelog
- @git archive --format=tar --prefix=initscripts-$(VERSION)/ HEAD > initscripts-$(VERSION).tar
- @mkdir -p initscripts-$(VERSION)/
- @cp ChangeLog initscripts-$(VERSION)/
- @tar --append -f initscripts-$(VERSION).tar initscripts-$(VERSION)
- @bzip2 -f initscripts-$(VERSION).tar
- @rm -rf initscripts-$(VERSION)
- @echo "The archive is at initscripts-$(VERSION).tar.bz2"
- @sha1sum initscripts-$(VERSION).tar.bz2 > initscripts-$(VERSION).sha1sum
- @scp initscripts-$(VERSION).tar.bz2 initscripts-$(VERSION).sha1sum fedorahosted.org:initscripts 2>/dev/null|| scp initscripts-$(VERSION).tar.bz2 initscripts-$(VERSION).sha1sum fedorahosted.org:/srv/web/releases/i/n/initscripts
- @echo "Everything done, files uploaded to Fedorahosted.org"
+ @make -C mandriva source