kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Avoid make.conf namespace collisions.

Browse source 
Submitted by:	Pietro Cerutti <gahr@gahr.ch>
This commit is contained in:
Cy Schubert 2007-10-29 20:18:43 +00:00
parent a568cf9165
commit 4d0b7f1030
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=202349
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sysutils/screen/Makefile
View file

@ -31,16 +31,14 @@ NO_PACKAGE= Tends to loop using 100% CPU when used from package - perhaps it har
GNU_CONFIGURE= yes
.if defined(WITH_MAN)
MAN1= screen.1
.else
MAKE_ARGS+= -DNO_MAN
MAKE_ARGS+= -DWITH_MAN
.endif
.if defined(WITH_INFO)
.if !exists(/usr/bin/install-info)
RUN_DEPENDS+= install-info:${PORTSDIR}/print/texinfo
.endif
INFO= screen
.else
MAKE_ARGS+= -DNO_INFO
MAKE_ARGS+= -DWITH_INFO
.endif
.if ${ARCH} == "alpha"

16
sysutils/screen/files/patch-doc_Makefile.in
View file

@ -1,18 +1,18 @@
--- doc/Makefile.in.orig 2007-07-30 17:16:19.000000000 +0200
+++ doc/Makefile.in 2007-07-30 17:18:14.000000000 +0200
--- doc/Makefile.in.orig 2007-10-29 13:08:52.000000000 -0700
+++ doc/Makefile.in 2007-10-29 13:11:09.000000000 -0700
@@ -30,7 +30,10 @@
$(MAKEINFO) $(srcdir)/screen.texinfo -o screen.info
$(MAKEINFO) --no-split $(srcdir)/screen.texinfo -o screen.info
install: installdirs
+.if !defined(NO_MAN)
+.if defined(WITH_MAN)
$(INSTALL_DATA) $(srcdir)/screen.1 $(DESTDIR)$(mandir)/man1/screen.1
+.endif
+.if !defined(NO_INFO)
+.if defined(WITH_INFO)
-$(MAKE) screen.info
-if test -f screen.info; then d=.; else d=$(srcdir); fi; \
if test -f $$d/screen.info; then \
@@ -39,13 +42,19 @@
install-info --info-dir=$(DESTDIR)$(infodir) $$d/screen.info; \
install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/screen.info; \
else true; fi; \
fi
+.endif
@ -23,10 +23,10 @@
installdirs:
- $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(infodir)
+.if !defined(NO_MAN)
+.if defined(WITH_MAN)
+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(mandir)/man1
+.endif
+.if !defined(NO_INFO)
+.if defined(WITH_INFO)
+ $(srcdir)/../etc/mkinstalldirs $(DESTDIR)$(infodir)
+.endif