diff options
| author | Thorsten Kukuk <kukuk@thkukuk.de> | 2004-09-28 13:48:45 +0000 |
|---|---|---|
| committer | Thorsten Kukuk <kukuk@thkukuk.de> | 2004-09-28 13:48:45 +0000 |
| commit | 6fb01537462a326a139f0c2d975145b26cd54bbe (patch) | |
| tree | 5cc76f47e9687823164fa214fb801ce0f37a0766 /libpam_misc | |
| parent | 328d7328e5b4ea8d60164ce874bada2f4f58a201 (diff) | |
| download | pam-6fb01537462a326a139f0c2d975145b26cd54bbe.tar.gz pam-6fb01537462a326a139f0c2d975145b26cd54bbe.tar.bz2 pam-6fb01537462a326a139f0c2d975145b26cd54bbe.zip | |
Relevant BUGIDs:
Purpose of commit:
Commit summary:
---------------
bugfix:
* Merge patches from Red Hat (Bug 477000 and other - kukuk)
* Fix pam_rhosts option parsing (Bug 922648 - kukuk)
Diffstat (limited to 'libpam_misc')
| -rw-r--r-- | libpam_misc/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libpam_misc/Makefile b/libpam_misc/Makefile index 88364a24..bb7ec27c 100644 --- a/libpam_misc/Makefile +++ b/libpam_misc/Makefile @@ -60,9 +60,9 @@ static/%.o : %.c $(LIBNAMED): $(DLIBOBJECTS) ifeq ($(DYNAMIC_LIBPAM),yes) ifeq ($(USESONAME),yes) - $(LD_L) $(SOSWITCH) $(LIBNAMEDNAME) -o $@ $(DLIBOBJECTS) $(MODULES) $(LINKLIBS) + $(LD_L) $(SOSWITCH)$(LIBNAMEDNAME) -o $@ $(DLIBOBJECTS) $(MODULES) $(LINKLIBS) else - $(LD_L) -o $@ $(DLIBOBJECTS) $(MODULES) + $(LD_L) -o $@ $(DLIBOBJECTS) $(MODULES) $(LINKLIBS) endif ifeq ($(NEEDSONAME),yes) rm -f $(LIBNAMEDFULL) @@ -74,9 +74,12 @@ endif $(LIBNAMEDSTATIC): $(SLIBOBJECTS) ifeq ($(STATIC_LIBPAM),yes) + $(AR) rcu $@ $(SLIBOBJECTS) $(MODULES) +ifdef RANLIB $(AR) rc $@ $(SLIBOBJECTS) $(MODULES) $(RANLIB) $@ endif +endif install: all $(MKDIR) $(FAKEROOT)$(INCLUDED) |