9 files changed, 10 insertions, 10 deletions

diff --git a/deskutils/etoile-extendedworkspacekit/Makefile b/deskutils/etoile-extendedworkspacekit/Makefile
index 5be78a396df9..d658a0ce3aaf 100644
--- a/deskutils/etoile-extendedworkspacekit/Makefile
+++ b/deskutils/etoile-extendedworkspacekit/Makefile
@@ -25,7 +25,7 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_SYSTEM_LIBS+=	TrackerKit:${TRACKERKIT_PORT}
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/deskutils/etoile-panekit/Makefile b/deskutils/etoile-panekit/Makefile
index 0080cb948fbf..6785affb8a9f 100644
--- a/deskutils/etoile-panekit/Makefile
+++ b/deskutils/etoile-panekit/Makefile
@@ -24,7 +24,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/deskutils/etoile-servicesbarkit/Makefile b/deskutils/etoile-servicesbarkit/Makefile
index 2bafe2de8964..48492994bcf6 100644
--- a/deskutils/etoile-servicesbarkit/Makefile
+++ b/deskutils/etoile-servicesbarkit/Makefile
@@ -25,7 +25,7 @@ USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 USE_GNUSTEP_LOCAL_LIBS+=	UnitKit:${UNITKIT_PORT}
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/deskutils/etoile-systemconfig/Makefile b/deskutils/etoile-systemconfig/Makefile
index a11aa05cb965..a705726a1e13 100644
--- a/deskutils/etoile-systemconfig/Makefile
+++ b/deskutils/etoile-systemconfig/Makefile
@@ -24,7 +24,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/deskutils/etoile-trackerkit/Makefile b/deskutils/etoile-trackerkit/Makefile
index 00eba8ed7802..e6b7222ce092 100644
--- a/deskutils/etoile-trackerkit/Makefile
+++ b/deskutils/etoile-trackerkit/Makefile
@@ -24,7 +24,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/deskutils/etoile-ui/Makefile b/deskutils/etoile-ui/Makefile
index 26b64e8d05ce..9be0cc3e8cad 100644
--- a/deskutils/etoile-ui/Makefile
+++ b/deskutils/etoile-ui/Makefile
@@ -24,7 +24,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
 DEFAULT_LIBVERSION=	0.1
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 SNAPSHOT=	20061221
 WRKSRC=	${WRKDIR}/Etoile/
diff --git a/deskutils/gnustep-wrapper/Makefile b/deskutils/gnustep-wrapper/Makefile
index 274439243b02..686372402393 100644
--- a/deskutils/gnustep-wrapper/Makefile
+++ b/deskutils/gnustep-wrapper/Makefile
@@ -20,7 +20,7 @@ USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 post-patch:
 	${REINPLACE_CMD} -e 's|cp -u|cp -p|' \
diff --git a/deskutils/gworkspace/Makefile b/deskutils/gworkspace/Makefile
index d7169395fd90..74a6032f69e8 100644
--- a/deskutils/gworkspace/Makefile
+++ b/deskutils/gworkspace/Makefile
@@ -20,7 +20,7 @@ USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_CONFIGURE=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-USE_GNUSTEP_LDCONFIG=	${SYSLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_SYSTEM_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/GWorkspace-${PORTVERSION}
 GNU_CONFIGURE=	yes
@@ -38,6 +38,6 @@ USE_GHOSTSCRIPT=	yes
 
 post-install:
 	${CP} ${WRKSRC}/Inspector/ContentViewersProtocol.h \
-		${SYSTEMDIR}/Library/Frameworks/Inspector.framework/Versions/A/Headers/ContentViewersProtocol.h
+		${GNUSTEP_SYSTEM_ROOT}/Library/Frameworks/Inspector.framework/Versions/A/Headers/ContentViewersProtocol.h
 
 .include <bsd.port.mk>
diff --git a/deskutils/toolboxkit/Makefile b/deskutils/toolboxkit/Makefile
index 270df112774b..8b4a9c014d2c 100644
--- a/deskutils/toolboxkit/Makefile
+++ b/deskutils/toolboxkit/Makefile
@@ -20,7 +20,7 @@ USE_GNUSTEP_PREFIX=	yes
 USE_GNUSTEP_BACK=	yes
 USE_GNUSTEP_BUILD=	yes
 USE_GNUSTEP_INSTALL=	yes
-USE_GNUSTEP_LDCONFIG=	${LOCALLIBDIR}
+USE_GNUSTEP_LDCONFIG=	${GNUSTEP_LOCAL_LIBRARIES}
 
 WRKSRC=		${WRKDIR}/Toolbox
 USE_GNUSTEP_MAKE_DIRS+=	Toolbox