--- plplot-5.8.0/examples/f95/Makefile.examples.in.multiarch	2007-11-18 13:04:09.000000000 -0700
+++ plplot-5.8.0/examples/f95/Makefile.examples.in	2007-12-05 17:00:50.000000000 -0700
@@ -25,8 +25,6 @@
 EXEEXT = @EXEEXT@
 
 @pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
 
 EXECUTABLES_list = \
 		 x01f$(EXEEXT) \
@@ -59,7 +57,7 @@
 	rm -f $(EXECUTABLES_list)
 
 .f90$(EXEEXT):
-@pkg_config_true@	$(F95) @MODULESINCCMD@ $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f95`
+@pkg_config_true@	$(F95) @MODULESINCCMD@ $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f95`
 @pkg_config_false@	$(F95) @MODULESINCCMD@ $< -o $@ `plplot-config --cflags --libs --with-f95`
 
 .SUFFIXES: .f90 $(EXEEXT)
--- plplot-5.8.0/examples/tk/Makefile.examples.in.multiarch	2007-11-18 13:04:09.000000000 -0700
+++ plplot-5.8.0/examples/tk/Makefile.examples.in	2007-11-19 16:51:13.000000000 -0700
@@ -24,8 +24,6 @@
 EXEEXT = @EXEEXT@
 
 @pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
 
 EXECUTABLES_list = \
 		 xtk01$(EXEEXT) \
@@ -38,7 +36,7 @@
 	rm -f $(EXECUTABLES_list)
 
 .c$(EXEEXT):
-@pkg_config_true@	$(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-tcl`
+@pkg_config_true@	$(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-tcl`
 @pkg_config_false@	$(CC) $< -o $@ `plplot-config --cflags --libs --with-tcl`
 
 .SUFFIXES: .c $(EXEEXT)
--- plplot-5.8.0/examples/f77/Makefile.examples.in.multiarch	2007-11-18 13:04:09.000000000 -0700
+++ plplot-5.8.0/examples/f77/Makefile.examples.in	2007-12-05 17:01:06.000000000 -0700
@@ -25,8 +25,6 @@
 EXEEXT = @EXEEXT@
 
 @pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
 
 EXECUTABLES_list = \
 		 x01f$(EXEEXT) \
@@ -59,7 +57,7 @@
 	rm -f $(EXECUTABLES_list)
 
 .f$(EXEEXT):
-@pkg_config_true@	$(F77) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-f77`
+@pkg_config_true@	$(F77) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-f77`
 @pkg_config_false@	$(F77) $< -o $@ `plplot-config --cflags --libs --with-f77`
 
 .SUFFIXES: .f $(EXEEXT)
--- plplot-5.8.0/examples/c/Makefile.examples.in.multiarch	2007-11-18 13:04:08.000000000 -0700
+++ plplot-5.8.0/examples/c/Makefile.examples.in	2007-12-05 17:01:44.000000000 -0700
@@ -25,8 +25,6 @@
 EXEEXT = @EXEEXT@
 
 @pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
 
 @gcw_true@PLPLOTCANVAS_EXECUTABLES_list = \
 @gcw_true@		 plplotcanvas_demo$(EXEEXT) \
@@ -69,21 +67,21 @@
 	rm -f $(EXECUTABLES_list)
 
 @gcw_true@plplotcanvas_demo$(EXEEXT): plplotcanvas_demo.c
-@gcw_true@@pkg_config_true@	$(CC) $< -o $@ $(RPATHCMD) \
-@gcw_true@@pkg_config_true@			`$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2`
+@gcw_true@@pkg_config_true@	$(CC) $< -o $@ \
+@gcw_true@@pkg_config_true@			`pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2`
 @gcw_true@@pkg_config_false@	$(CC) $< -o $@ \
 @gcw_true@@pkg_config_false@			`plplot-config --cflags --libs --with-gcw`
 
 @gcw_true@plplotcanvas_animation$(EXEEXT): plplotcanvas_animation.c
-@gcw_true@@pkg_config_true@	$(CC) $< -o $@ $(RPATHCMD) \
-@gcw_true@@pkg_config_true@			`$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \
+@gcw_true@@pkg_config_true@	$(CC) $< -o $@ \
+@gcw_true@@pkg_config_true@			`pkg-config --cflags --libs plplot$(LIB_TAG)-gnome2` \
 @gcw_true@@pkg_config_true@			`pkg-config --cflags --libs gthread-2.0`			
 @gcw_true@@pkg_config_false@	$(CC) $< -o \
 @gcw_true@@pkg_config_false@			$@ `plplot-config --cflags --libs --with-gcw` \
 @gcw_true@@pkg_config_false@			@GCWTHREAD_CFLAGS@ @GCWTHREAD_LIBS@
 
 .c$(EXEEXT):
-@pkg_config_true@	$(CC) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)`
+@pkg_config_true@	$(CC) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)`
 @pkg_config_false@	$(CC) $< -o $@ `plplot-config --cflags --libs`
 
 .SUFFIXES: .c $(EXEEXT)
--- plplot-5.8.0/examples/c++/Makefile.examples.in.multiarch	2007-11-18 13:04:09.000000000 -0700
+++ plplot-5.8.0/examples/c++/Makefile.examples.in	2007-12-05 17:02:03.000000000 -0700
@@ -25,8 +25,6 @@
 EXEEXT = @EXEEXT@
 
 @pkg_config_true@LIB_TAG = @LIB_TAG@
-@pkg_config_true@PKG_CONFIG_ENV = @PKG_CONFIG_ENV@
-@pkg_config_true@RPATHCMD = @RPATHCMD@
 
 @wxwidgets_true@@pkg_config_true@PLPLOTWXWIDGETS_EXECUTABLES_list = \
 @wxwidgets_true@@pkg_config_true@	wxPLplotDemo$(EXEEXT)
@@ -68,10 +66,10 @@
 	rm -f $(EXECUTABLES_list)
 
 @wxwidgets_true@@pkg_config_true@wxPLplotDemo$(EXEEXT): wxPLplotDemo.cpp
-@wxwidgets_true@@pkg_config_true@	$(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets`
+@wxwidgets_true@@pkg_config_true@	$(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-wxwidgets`
 
 .cc$(EXEEXT):
-@pkg_config_true@	$(CXX) $< -o $@ $(RPATHCMD) `$(PKG_CONFIG_ENV) pkg-config --cflags --libs plplot$(LIB_TAG)-c++`
+@pkg_config_true@	$(CXX) $< -o $@ `pkg-config --cflags --libs plplot$(LIB_TAG)-c++`
 @pkg_config_false@	$(CXX) $< -o $@ `plplot-config --cflags --libs --with-c++`
 
 .SUFFIXES: .c $(EXEEXT)