diff options
| author | Michael Nottebrock <lofi@FreeBSD.org> | 2007-07-17 21:53:29 +0000 |
|---|---|---|
| committer | Michael Nottebrock <lofi@FreeBSD.org> | 2007-07-17 21:53:29 +0000 |
| commit | 7780b8e31ffb3d6db71b432a56fd9b1addaf3651 (patch) | |
| tree | 0f1406c7803a302031fbb79d7fbb967c9f05af31 /sysutils/libutempter | |
| parent | 7452001065b9b07867987a921477981cdaac1d6e (diff) | |
| download | ports-7780b8e31ffb3d6db71b432a56fd9b1addaf3651.tar.gz ports-7780b8e31ffb3d6db71b432a56fd9b1addaf3651.zip | |
Fix bogus LIBEXECDIR definition and replace ln -s with ln -sf in install
target.
Reported by: Andriy Gapon <avg@icyb.net.ua>
Notes
Notes:
svn path=/head/; revision=195817
Diffstat (limited to 'sysutils/libutempter')
| -rw-r--r-- | sysutils/libutempter/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/libutempter/files/patch-Makefile | 19 |
2 files changed, 12 insertions, 8 deletions
diff --git a/sysutils/libutempter/Makefile b/sysutils/libutempter/Makefile index 53836f34cac5..213f9cc0cbe2 100644 --- a/sysutils/libutempter/Makefile +++ b/sysutils/libutempter/Makefile @@ -6,6 +6,7 @@ PORTNAME= libutempter PORTVERSION= 1.1.5 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.altlinux.org/pub/people/ldv/utempter/ diff --git a/sysutils/libutempter/files/patch-Makefile b/sysutils/libutempter/files/patch-Makefile index b551924be02a..380890cda3d2 100644 --- a/sysutils/libutempter/files/patch-Makefile +++ b/sysutils/libutempter/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Sun Dec 11 13:13:49 2005 -+++ Makefile Thu Feb 8 10:13:03 2007 -@@ -31,10 +31,10 @@ +--- Makefile.orig 2007-02-19 13:14:08.000000000 +0100 ++++ Makefile 2007-07-17 23:42:11.000000000 +0200 +@@ -30,18 +30,18 @@ TARGETS = $(PROJECT) $(SHAREDLIB) $(STATICLIB) INSTALL = install @@ -15,16 +15,17 @@ WARNINGS = -W -Wall -Waggregate-return -Wcast-align -Wconversion \ -Wdisabled-optimization -Wmissing-declarations \ -@@ -42,7 +42,7 @@ + -Wmissing-format-attribute -Wmissing-noreturn \ -Wmissing-prototypes -Wpointer-arith -Wredundant-decls \ -Wshadow -Wstrict-prototypes -Wwrite-strings - CPPFLAGS = -std=gnu99 $(WARNINGS) -DLIBEXECDIR=\"$(libexecdir)\" +-CPPFLAGS = -std=gnu99 $(WARNINGS) -DLIBEXECDIR=\"$(libexecdir)\" -CFLAGS = $(RPM_OPT_FLAGS) ++CPPFLAGS = -std=gnu99 $(WARNINGS) +CFLAGS+= -DLIBEXECDIR=\"$(PREFIX)$(libexecdir)\" LDLIBS = all: $(TARGETS) -@@ -64,15 +64,20 @@ +@@ -63,15 +63,20 @@ iface.o: iface.c utempter.h @@ -40,12 +41,14 @@ - $(INSTALL) -p -m644 $(PROJECT).h $(DESTDIR)$(includedir)/ - $(INSTALL) -p -m755 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDLIB).$(VERSION) - $(INSTALL) -p -m644 $(STATICLIB) $(DESTDIR)$(libdir)/ +- ln -s $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME) +- ln -s $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB) + $(INSTALL) -m4711 $(PROJECT) $(DESTDIR)$(libexecdir)/$(PROJECT)/$(PROJECT) + $(INSTALL) -m644 $(PROJECT).h $(DESTDIR)$(includedir)/$(PROJECT).h + $(INSTALL) -m755 $(SHAREDLIB) $(DESTDIR)$(libdir)/$(SHAREDLIB).$(VERSION) + $(INSTALL) -m644 $(STATICLIB) $(DESTDIR)$(libdir)/$(STATICLIB) - ln -s $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME) - ln -s $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB) ++ ln -sf $(SHAREDLIB).$(VERSION) $(DESTDIR)$(libdir)/$(SONAME) ++ ln -sf $(SONAME) $(DESTDIR)$(libdir)/$(SHAREDLIB) clean: - $(RM) $(TARGETS) iface.o iface.os core *~ |