Fix merge conflicts

[bsdgames-darwin.git] / hack / pathnames.h

diff --git a/hack/pathnames.h b/hack/pathnames.h
index 1df8f008a6f93f19eb4cebd0031a03e5f9e96724..bbd2fa7123f7969fe6e8f032ae2ce8517d6dfa93 100644 (file)
--- a/hack/pathnames.h
+++ b/hack/pathnames.h
@@ -1,6 +1,8 @@
+/*     $NetBSD: pathnames.h,v 1.4 2003/08/07 09:37:19 agc Exp $        */
+
 /*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1990, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,11 +12,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -30,10 +28,12 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *     @(#)pathnames.h 5.1 (Berkeley) 5/2/90
+ *     @(#)pathnames.h 8.1 (Berkeley) 5/31/93
  */
 
-#define        _PATH_MAIL      "/usr/bin/mail"
-#define        _PATH_QUEST     "/var/games/questdir"
-#define        _PATH_HACK      "/var/games/hackdir"
+#include "config.h"
+
+#define        _PATH_MAIL      PREFIX"/bin/mail"
+#define        _PATH_QUEST     LOCALSTATEDIR"/games/questdir"
+#define        _PATH_HACK      LOCALSTATEDIR"/games/hackdir"