Make sure git ignores new executable files in src directory.

Make location of libcrypt library more flexible.
This commit is contained in:
Jesse Smith 2019-09-12 17:35:55 -03:00
parent 13cb3665b1
commit ad50c8272e
3 changed files with 13 additions and 2 deletions

View File

@ -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 sysvinit (2.96) released; urgency=low
[ Jesse Smith ] [ Jesse Smith ]

2
src/.gitignore vendored
View File

@ -4,7 +4,9 @@ halt
init init
killall5 killall5
last last
logsave
mesg mesg
readbootlog
runlevel runlevel
shutdown shutdown
sulogin sulogin

View File

@ -90,14 +90,16 @@ else
endif endif
# Additional libs for GNU libc. # Additional libs for GNU libc.
ifneq ($(wildcard /usr/lib*/libcrypt.*),) ifneq ($(wildcard $(ROOT)/usr/lib*/libcrypt.*),)
SULOGINLIBS += -lcrypt SULOGINLIBS += -lcrypt
endif endif
# Additional libs for GNU libc / multiarch on Debian based systems. # 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 SULOGINLIBS += -lcrypt
endif endif
endif
all: $(BIN) $(SBIN) $(USRBIN) all: $(BIN) $(SBIN) $(USRBIN)