diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-10-17 19:56:43 +0100 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-10-18 09:35:39 +0100 |
| commit | 9cec39ee7ef6a745c3a9b19d1ba6e89b09da43c3 (patch) | |
| tree | 3a122662900195e7b14067a03cd5124358db9daf /src/Makefile | |
| parent | 423b437e3d29673dfad4051515506e6d711d20e6 (diff) | |
| parent | 8f5a82934f801ec94847fc899d235a39df9967a7 (diff) | |
| download | initscripts-user/colin/update-to-9-50.tar initscripts-user/colin/update-to-9-50.tar.gz initscripts-user/colin/update-to-9-50.tar.bz2 initscripts-user/colin/update-to-9-50.tar.xz initscripts-user/colin/update-to-9-50.zip | |
Merge tag 'initscripts-9.50-1' into distro/mgauser/colin/update-to-9-50
Tag as initscripts-9.50-1
Conflicts:
Makefile
lang.csh
lang.sh
po/Makefile
rc.d/init.d/network
service
sysconfig.txt
sysconfig/init
sysconfig/network-scripts/ifup
sysconfig/network-scripts/ifup-eth
sysconfig/network-scripts/ifup-ippp
sysconfig/network-scripts/network-functions
sysctl.conf
systemd/fedora-storage-init
Diffstat (limited to 'src/Makefile')
| -rw-r--r-- | src/Makefile | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/src/Makefile b/src/Makefile index d93e7202..dc4bf593 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,4 +1,5 @@ CFLAGS+=$(RPM_OPT_FLAGS) -Wall -D_GNU_SOURCE +LDFLAGS+=$(RPM_LD_FLAGS) PROGS=usernetctl netreport usleep ipcalc \ ppp-watch consoletype genhostid rename_device @@ -17,16 +18,16 @@ clean: rm -f $(PROGS) *.o *~ install: - mkdir -p $(ROOT)/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc $(ROOT)/lib/udev - install -m 755 usleep $(ROOT)/bin/usleep + mkdir -p $(ROOT)/usr/bin $(ROOT)/usr/sbin $(ROOT)$(mandir)/man{1,8} $(ROOT)/etc $(ROOT)/usr/lib/udev + install -m 755 usleep $(ROOT)/usr/bin/usleep install -m 4755 usernetctl $(ROOT)/usr/sbin/usernetctl - install -m 2755 netreport $(ROOT)/sbin/netreport - install -m 755 ipcalc $(ROOT)/bin/ipcalc - install -m 755 genhostid $(ROOT)/sbin/genhostid - install -m 755 ppp-watch $(ROOT)/sbin/ppp-watch - install -m 755 consoletype $(ROOT)/sbin/consoletype - install -m 755 sushell $(ROOT)/sbin/sushell - install -m 755 rename_device $(ROOT)/lib/udev/rename_device + install -m 2755 netreport $(ROOT)/usr/sbin/netreport + install -m 755 ipcalc $(ROOT)/usr/bin/ipcalc + install -m 755 genhostid $(ROOT)/usr/sbin/genhostid + install -m 755 ppp-watch $(ROOT)/usr/sbin/ppp-watch + install -m 755 consoletype $(ROOT)/usr/sbin/consoletype + install -m 755 sushell $(ROOT)/usr/sbin/sushell + install -m 755 rename_device $(ROOT)/usr/lib/udev/rename_device install -m 644 genhostid.1 $(ROOT)$(mandir)/man1 install -m 644 netreport.1 $(ROOT)$(mandir)/man1 install -m 644 usleep.1 $(ROOT)$(mandir)/man1 @@ -35,7 +36,6 @@ install: install -m 644 ipcalc.1 $(ROOT)$(mandir)/man1 install -m 644 consoletype.1 $(ROOT)$(mandir)/man1 install -m 644 ifup.8 $(ROOT)$(mandir)/man8 - install -m 644 setsysfont.8 $(ROOT)$(mandir)/man8 install -m 644 sushell.8 $(ROOT)$(mandir)/man8 ln -s ifup.8 $(ROOT)$(mandir)/man8/ifdown.8 @@ -52,7 +52,13 @@ usernetctl.o: usernetctl.c $(CC) $(CFLAGS) -fPIE -c usernetctl.c -o usernetctl.o usernetctl: usernetctl.c usernetctl.o - $(CC) $(LDFLAGS) -pie -o $@ $@.o + $(CC) $(LDFLAGS) -pie -z relro -z now -o $@ $@.o + +netreport.o: netreport.c + $(CC) $(CFLAGS) -fPIE -c netreport.c -o netreport.o + +netreport: netreport.o + $(CC) $(LDFLAGS) -pie -z relro -z now -o $@ $@.o shvar.o: shvar.c $(CC) $(CFLAGS) `pkg-config glib-2.0 --cflags` -c shvar.c -o shvar.o |