X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=include%2Fatalk%2Fpaths.h;h=f5f6486cfb634d0e585cef21923c7bd0c3e0928b;hb=3a84db87064922ad10ac10cc1d6833380e575995;hp=ae076a7a02743c5505ff52b94108d4de7d9e9a0a;hpb=3db0464e8205109a069398a41a5ef13e2ef4b0c7;p=netatalk.git

diff --git a/include/atalk/paths.h b/include/atalk/paths.h
index ae076a7a..f5f6486c 100644
--- a/include/atalk/paths.h
+++ b/include/atalk/paths.h
@@ -7,74 +7,11 @@
 #define BROKEN_ECHO(a)    a
 #define ATALKPATHCAT(a,b) BROKEN_ECHO(a)##BROKEN_ECHO(b)
 #else
-#define ATALKPATHCAT(a,b) a##b
+#define ATALKPATHCAT(a,b) a b
 #endif
 #else
 #define ATALKPATHCAT(a,b) a/**/b
 #endif
 
-
-/* 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
-
-/*
- * 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
-
-/*
- * 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
-
 #endif /* atalk/paths.h */
+