From bd110c56497ba393e2fa860c5f1f30b1cffe5368 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Fri, 4 Feb 2011 12:25:12 +0100 Subject: set default shmmax and shmall for certain architectures (#660036) --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8380d95f..9a7c86ff 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,8 @@ VERSION := $(shell awk '/Version:/ { print $$2 }' initscripts.spec) RELEASE := $(shell awk '/Release:/ { print $$2 }' initscripts.spec | sed 's|%{?dist}||g') TAG=initscripts-$(VERSION)-$(RELEASE) +ARCH=$(shell uname -m) + mandir=/usr/share/man all: @@ -33,10 +35,8 @@ install: install -m644 crypttab.5 $(ROOT)$(mandir)/man5 install -m644 service.8 sys-unconfig.8 $(ROOT)$(mandir)/man8 install -m644 sysctl.conf $(ROOT)/etc/sysctl.conf - if uname -m | grep -q sparc ; then \ - install -m644 sysctl.conf.sparc $(ROOT)/etc/sysctl.conf ; fi - if uname -m | grep -q s390 ; then \ - install -m644 sysctl.conf.s390 $(ROOT)/etc/sysctl.conf ; fi + if [ -f sysctl.conf.$(ARCH) ]; then \ + install -m644 sysctl.conf.$(ARCH) $(ROOT)/etc/sysctl.conf ; fi mkdir -p $(ROOT)/etc/X11 install -m755 prefdm $(ROOT)/etc/X11/prefdm -- cgit v1.2.1