$OpenBSD: patch-include_atalk_paths_h,v 1.2 2003/08/22 11:18:19 naddy Exp $
--- include/atalk/paths.h.orig	Wed Aug  1 05:51:12 2001
+++ include/atalk/paths.h	Fri Jun 21 06:16:32 2002
@@ -16,65 +16,33 @@
 
 /* lock file path. this should be re-organized a bit. */
 #if ! defined (_PATH_LOCKDIR)
-#  if defined (FHS_COMPATIBILITY)
 #    define _PATH_LOCKDIR	"/var/run/"
-#  elif defined (BSD4_4)
-#    ifdef MACOSX_SERVER
-#      define _PATH_LOCKDIR	"/var/run/"
-#    else
-#      define _PATH_LOCKDIR	"/var/spool/lock/"
-#    endif
-#  elif defined (linux)
-#    define _PATH_LOCKDIR	"/var/lock/"
-#  else
-#    define _PATH_LOCKDIR	"/var/spool/locks/"
-#  endif
 #endif
 
 /*
  * papd paths
  */
 #define _PATH_PAPDPRINTCAP	"/etc/printcap"
-#ifdef ultrix
-#define _PATH_PAPDSPOOLDIR	"/usr/spool/lpd"
-#else /* !ultrix */
 #define _PATH_PAPDSPOOLDIR	"/var/spool/lpd"
-#endif /* ultrix */
-#ifdef BSD4_4
 #define _PATH_DEVPRINTER	"/var/run/printer"
-#else /* !BSD4_4 */
-#define _PATH_DEVPRINTER	"/dev/printer"
-#endif /* BSD4_4 */
 
 /*
  * atalkd paths
  */
 #define _PATH_ATALKDEBUG	"/tmp/atalkd.debug"
 #define _PATH_ATALKDTMP		"atalkd.tmp"
-#ifdef FHS_COMPATIBILITY
-#  define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid")
-#else
-#  define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd")
-#endif
+#define _PATH_ATALKDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"atalkd.pid")
 
 /*
  * psorder paths
  */
 #define _PATH_TMPPAGEORDER	"/tmp/psorderXXXXXX"
-#ifdef FHS_COMPATIBILITY
-#  define _PATH_PAPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid")
-#else
-#  define _PATH_PAPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"papd")
-#endif
+#define _PATH_PAPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"papd.pid")
 
 /*
  * afpd paths
  */
 #define _PATH_AFPTKT		"/tmp/AFPtktXXXXXX"
-#ifdef FHS_COMPATIBILITY
-#  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid")
-#else
-#  define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd")
-#endif
+#define _PATH_AFPDLOCK	ATALKPATHCAT(_PATH_LOCKDIR,"afpd.pid")
 
 #endif /* atalk/paths.h */
