Make sure git ignores new executable files in src directory.
Make location of libcrypt library more flexible.
This commit is contained in:
parent
13cb3665b1
commit
ad50c8272e
@ -1,3 +1,10 @@
|
||||
sysvinit (2.97) unreleased; urgency=low
|
||||
|
||||
* Check $(ROOT) filesystem for libcrypt instead of a hardcoded path to /usr.
|
||||
Added logsave and readbootlog to list of files git ignores.
|
||||
- Patches provided by Petr Ovtchenkov.
|
||||
|
||||
|
||||
sysvinit (2.96) released; urgency=low
|
||||
|
||||
[ Jesse Smith ]
|
||||
|
2
src/.gitignore
vendored
2
src/.gitignore
vendored
@ -4,7 +4,9 @@ halt
|
||||
init
|
||||
killall5
|
||||
last
|
||||
logsave
|
||||
mesg
|
||||
readbootlog
|
||||
runlevel
|
||||
shutdown
|
||||
sulogin
|
||||
|
@ -90,14 +90,16 @@ else
|
||||
endif
|
||||
|
||||
# Additional libs for GNU libc.
|
||||
ifneq ($(wildcard /usr/lib*/libcrypt.*),)
|
||||
ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),)
|
||||
SULOGINLIBS += -lcrypt
|
||||
endif
|
||||
|
||||
# Additional libs for GNU libc / multiarch on Debian based systems.
|
||||
ifneq ($(wildcard /usr/lib/*/libcrypt.*),)
|
||||
ifneq ($(wildcard $(ROOT)/usr/lib/*/libcrypt.*),)
|
||||
ifneq ($(findstring -lcrypt, $(SULOGINLIBS)), -lcrypt)
|
||||
SULOGINLIBS += -lcrypt
|
||||
endif
|
||||
endif
|
||||
|
||||
all: $(BIN) $(SBIN) $(USRBIN)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user