| | 1 | diff -Nru procps-3.2.8.orig/Makefile procps-3.2.8/Makefile |
| | 2 | --- procps-3.2.8.orig/Makefile 2010-11-07 11:59:17.736493931 +0100 |
| | 3 | +++ procps-3.2.8/Makefile 2010-11-07 12:24:02.973714246 +0100 |
| | 4 | @@ -24,26 +24,26 @@ |
| | 5 | ############ vars |
| | 6 | |
| | 7 | # so you can disable them or choose alternates |
| | 8 | -ldconfig := ldconfig |
| | 9 | +ldconfig := true |
| | 10 | ln_f := ln -f |
| | 11 | ln_sf := ln -sf |
| | 12 | install := install -D --owner 0 --group 0 |
| | 13 | |
| | 14 | # Lame x86-64 /lib64 and /usr/lib64 abomination: |
| | 15 | -lib64 := lib$(shell [ -d /lib64 ] && echo 64) |
| | 16 | +lib64 := lib |
| | 17 | |
| | 18 | usr/bin := $(DESTDIR)/usr/bin/ |
| | 19 | bin := $(DESTDIR)/bin/ |
| | 20 | sbin := $(DESTDIR)/sbin/ |
| | 21 | usr/proc/bin := $(DESTDIR)/usr/bin/ |
| | 22 | -man1 := $(DESTDIR)/usr/share/man/man1/ |
| | 23 | -man5 := $(DESTDIR)/usr/share/man/man5/ |
| | 24 | -man8 := $(DESTDIR)/usr/share/man/man8/ |
| | 25 | +man1 := $(DESTDIR)/usr/man/man1/ |
| | 26 | +man5 := $(DESTDIR)/usr/man/man5/ |
| | 27 | +man8 := $(DESTDIR)/usr/man/man8/ |
| | 28 | lib := $(DESTDIR)/$(lib64)/ |
| | 29 | usr/lib := $(DESTDIR)/usr/$(lib64)/ |
| | 30 | usr/include := $(DESTDIR)/usr/include/ |
| | 31 | |
| | 32 | -#SKIP := $(bin)kill $(man1)kill.1 |
| | 33 | +SKIP := $(bin)kill $(man1)kill.1 |
| | 34 | |
| | 35 | BINFILES := $(usr/bin)uptime $(usr/bin)tload $(usr/bin)free $(usr/bin)w \ |
| | 36 | $(usr/bin)top $(usr/bin)vmstat $(usr/bin)watch $(usr/bin)skill \ |
| | 37 | @@ -174,7 +174,8 @@ |
| | 38 | # want this rule first, use := on ALL, and ALL not filled in yet |
| | 39 | all: do_all |
| | 40 | |
| | 41 | --include */module.mk |
| | 42 | +-include proc/module.mk |
| | 43 | +-include ps/module.mk |
| | 44 | |
| | 45 | do_all: $(ALL) |
| | 46 | |
| | 47 | @@ -222,14 +223,14 @@ |
| | 48 | ###### install |
| | 49 | |
| | 50 | $(BINFILES) : all |
| | 51 | - $(install) --mode a=rx $(notdir $@) $@ |
| | 52 | + $(install) --mode=0755 $(notdir $@) $@ |
| | 53 | |
| | 54 | $(MANFILES) : all |
| | 55 | - $(install) --mode a=r $(notdir $@) $@ |
| | 56 | + $(install) --mode=0644 $(notdir $@) $@ |
| | 57 | |
| | 58 | install: $(filter-out $(SKIP) $(addprefix $(DESTDIR),$(SKIP)),$(INSTALL)) |
| | 59 | - cd $(usr/bin) && $(ln_f) skill snice |
| | 60 | - cd $(usr/proc/bin) && $(ln_f) pgrep pkill |
| | 61 | + cd $(usr/bin) && $(ln_sf) skill snice |
| | 62 | + cd $(usr/proc/bin) && $(ln_sf) pgrep pkill |
| | 63 | |
| | 64 | ############ prog.c --> prog.o |
| | 65 | |
| | 66 | diff -Nru procps-3.2.8.orig/proc/module.mk procps-3.2.8/proc/module.mk |
| | 67 | --- procps-3.2.8.orig/proc/module.mk 2010-11-07 11:59:17.746493508 +0100 |
| | 68 | +++ procps-3.2.8/proc/module.mk 2010-11-07 12:29:58.358664876 +0100 |
| | 69 | @@ -96,7 +96,7 @@ |
| | 70 | #################### install rules ########################### |
| | 71 | |
| | 72 | $(lib)$(SOFILE) : proc/$(SONAME) |
| | 73 | - $(install) --mode a=rx $< $@ |
| | 74 | + $(install) --mode=0755 $< $@ |
| | 75 | |
| | 76 | ifneq ($(SOLINK),$(SOFILE)) |
| | 77 | .PHONY: $(lib)$(SOLINK) |
| | 78 | diff -Nru procps-3.2.8.orig/ps/module.mk procps-3.2.8/ps/module.mk |
| | 79 | --- procps-3.2.8.orig/ps/module.mk 2010-11-07 11:59:17.746493508 +0100 |
| | 80 | +++ procps-3.2.8/ps/module.mk 2010-11-07 12:26:19.287944149 +0100 |
| | 81 | @@ -33,8 +33,8 @@ |
| | 82 | |
| | 83 | |
| | 84 | $(bin)ps: ps/ps |
| | 85 | - $(install) --mode a=rx $< $@ |
| | 86 | + $(install) --mode=0755 $< $@ |
| | 87 | |
| | 88 | $(man1)ps.1 : ps/ps.1 |
| | 89 | - $(install) --mode a=r $< $@ |
| | 90 | + $(install) --mode=0644 $< $@ |
| | 91 | -rm -f $(DESTDIR)/var/catman/cat1/ps.1.gz $(DESTDIR)/var/man/cat1/ps.1.gz |
development / crossrootfs.git / blame_incremental