summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwennmach <wennmach@pkgsrc.org>2000-08-22 15:04:19 +0000
committerwennmach <wennmach@pkgsrc.org>2000-08-22 15:04:19 +0000
commitc4ce33123e242a755a646e77fa0603f21ea2c215 (patch)
treec038bab8e25c2f740c6ebb4f54bf1d64ee2ae187
parent4d2efff6df3fc6e780dfea7b3ceabe0172c2a9d3 (diff)
downloadpkgsrc-c4ce33123e242a755a646e77fa0603f21ea2c215.tar.gz
Do not bail out if host returns an empty string or does not work.
This way to obtain the fully qualified domain name of the machine only generates warnings.
-rw-r--r--misc/jitterbug/Makefile11
1 files changed, 8 insertions, 3 deletions
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index a36adb39398..2750fa79a38 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2000/08/18 16:22:38 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2000/08/22 15:04:19 wennmach Exp $
DISTNAME= jitterbug-1.6.2
WRKSRC= ${WRKDIR}/${PKGNAME}/source
@@ -50,7 +50,12 @@ JB_CONFIGDIR= ${JB_USER}/config
JB_LOCALMAIL?= ${JB_PACKAGE}-bugs
.if !defined(JB_FQHOSTNAME)
-JB_FQHOSTNAME!= (${HOSTCMD} `/bin/hostname` 2>/dev/null || echo totally.unknown.domain) | /usr/bin/awk '{ print $$1; exit }'
+JB_TMP!= ${HOSTCMD} `/bin/hostname` 2>/dev/null
+.if (${JB_TMP} == "")
+JB_FQHOSTNAME="totally.unknown.domain"
+.else
+JB_FQHOSTNAME!= echo ${JB_TMP} | /usr/bin/awk '{ print $$1; exit}'
+.endif
.endif
JB_EMAIL?= ${JB_LOCALMAIL}@${JB_FQHOSTNAME}
@@ -73,7 +78,7 @@ pre-extract:
@${ECHO} "pkgsrc will build jitterbug with \$$JB_PACKAGE = \"test\""
@${ECHO} "so that you can easily evaluate this package."
@${ECHO} "If you decide to use jitterbug for a real application"
- @${ECHO} "you can safly deinstall jitterbug and reinstall it with"
+ @${ECHO} "you can safely deinstall jitterbug and reinstall it with"
@${ECHO} "\$$JB_PACKAGE set to something more senseful."
@${ECHO}
@${ECHO} "You may override the following environment variables:"