diff options
| author | sakamoto <sakamoto> | 1999-12-20 05:28:50 +0000 |
|---|---|---|
| committer | sakamoto <sakamoto> | 1999-12-20 05:28:50 +0000 |
| commit | 866789b5ad3018c03afa03bee86fe5f92931be57 (patch) | |
| tree | 6b5694ae8c1bdaee4457cea18be1110be82ecfca /misc | |
| parent | 9233d99a3a567008b2fb07b2710d3dc9f61a179d (diff) | |
| download | pkgsrc-866789b5ad3018c03afa03bee86fe5f92931be57.tar.gz | |
Eliminate "<<<<<<< Makefile", "=======", ">>>>>>> 1.5" and old block.
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/jitterbug/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile index 2617fcaaa1d..818a3c9d03f 100644 --- a/misc/jitterbug/Makefile +++ b/misc/jitterbug/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 1999/12/17 11:11:10 agc Exp $ +# $NetBSD: Makefile,v 1.7 1999/12/20 05:28:50 sakamoto Exp $ DISTNAME= jitterbug-1.6.2 WRKSRC= ${WRKDIR}/${PKGNAME}/source @@ -42,12 +42,8 @@ JB_CONFIGDIR= ${JB_USER}/config JB_LOCALMAIL?= ${JB_PACKAGE}-bugs .if !defined(JB_FQHOSTNAME) -<<<<<<< Makefile JB_HOSTNAME!= /bin/hostname JB_FQHOSTNAME!= ${NSLOOKUP} ${JB_HOSTNAME} | /usr/bin/awk '/^Name: / { print $$2; exit }' -======= -JB_FQHOSTNAME!= (${HOSTCMD} `/bin/hostname` 2>/dev/null || echo totally.unknown.domain) | /usr/bin/awk '{ print $$1; exit }' ->>>>>>> 1.5 .endif JB_EMAIL?= ${JB_LOCALMAIL}@${JB_FQHOSTNAME} |