--- freewrl-1.18.10/Makefile.PL.orig 2007-01-17 07:58:17.000000000 +0100 +++ freewrl-1.18.10/Makefile.PL 2007-01-17 07:58:05.000000000 +0100 @@ -292,46 +292,46 @@ print MK "\tstrip SoundEngine/FreeWRL_SoundServer\n"; } } - print MK "\tinstall -D CFrontEnd/freewrl \$(FRONTEND_DIR)/freewrl\n"; - print MK "\tinstall -D FreeWRL_Message/FreeWRL_Message \$(FRONTEND_DIR)FreeWRL_Message\n"; + print MK "\tinstall -D CFrontEnd/freewrl \$(DESTDIR)\$(FRONTEND_DIR)/freewrl\n"; + print MK "\tinstall -D FreeWRL_Message/FreeWRL_Message \$(DESTDIR)/\$(FRONTEND_DIR)FreeWRL_Message\n"; } if ($OS eq "Linux") { - print MK "\tinstall -D libFreeWRLFunc.so \$(LIB_DIR)/libFreeWRLFunc.so\n"; - print MK "\tinstall -D $libFreeWRLjspath \$(LIB_DIR)/libFreeWRLjs.so\n"; + print MK "\tinstall -D libFreeWRLFunc.so \$(DESTDIR)/\$(LIB_DIR)/libFreeWRLFunc.so\n"; + print MK "\tinstall -D $libFreeWRLjspath \$(DESTDIR)/\$(LIB_DIR)/libFreeWRLjs.so\n"; if ($HAVE_UBUNTU eq "NO") { print MK "\t/sbin/ldconfig\n"; } } if ($VRML_CONFIG{SOUND_ENGINE}) { - print MK "\tinstall -D SoundEngine/FreeWRL_SoundServer \$(FRONTEND_DIR)/FreeWRL_SoundServer\n"; + print MK "\tinstall -D SoundEngine/FreeWRL_SoundServer \$(DESTDIR)/\$(FRONTEND_DIR)/FreeWRL_SoundServer\n"; } - if (($JAVAC ne "") || ($VRML_CONFIG{NETSCAPE_INST} ne "")) { + if (($JAVAC ne "") && ($VRML_CONFIG{NETSCAPE_INST} ne "")) { if ($OS ne "Darwin") { - print MK "\tinstall -D java/classes/vrml.jar $VRML_CONFIG{NETSCAPE_INST}/vrml.jar\n"; - print MK "\tinstall -D Plugin/npfreewrl.so $VRML_CONFIG{NETSCAPE_INST}/npfreewrl.so\n"; + print MK "\tinstall -D java/classes/vrml.jar \$(DESTDIR)/$VRML_CONFIG{NETSCAPE_INST}/vrml.jar\n"; + print MK "\tinstall -D Plugin/npfreewrl.so \$(DESTDIR)/$VRML_CONFIG{NETSCAPE_INST}/npfreewrl.so\n"; } else { - print MK "\tinstall -d \$(INSTALL_DIR)\/freewrl\n"; - print MK "\tinstall java/classes/vrml.jar \$(INSTALL_DIR)\/freewrl\n"; + print MK "\tinstall -d \$(DESTDIR)/\$(INSTALL_DIR)\/freewrl\n"; + print MK "\tinstall java/classes/vrml.jar \$(DESTDIR)/\$(INSTALL_DIR)\/freewrl\n"; } } if ($OS ne "Darwin") { - print MK "\tinstall -D Desktop/freewrl.png \$(INSTALL_DIR)\/pixmaps/Desktop/freewrl.png\n"; - print MK "\tinstall -D Desktop/freewrl.desktop \$(INSTALL_DIR)\/applications/Desktop/freewrl.desktop\n"; + print MK "\tinstall -D Desktop/freewrl.png \$(DESTDIR)/\$(INSTALL_DIR)\/pixmaps/Desktop/freewrl.png\n"; + print MK "\tinstall -D Desktop/freewrl.desktop \$(DESTDIR)/\$(INSTALL_DIR)\/applications/Desktop/freewrl.desktop\n"; # we need the 2 installs for the following; the first makes the directory, the second fills it. - print MK "\tinstall -d fonts \$(INSTALL_DIR)/freewrl/fonts\n"; - print MK "\tinstall -D fonts/* \$(INSTALL_DIR)/freewrl/fonts\n"; - print MK "\tinstall -d x3d \$(INSTALL_DIR)/freewrl/x3d\n"; - print MK "\tinstall -D x3d/* \$(INSTALL_DIR)/freewrl/x3d\n"; + print MK "\tinstall -d fonts \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/fonts\n"; + print MK "\tinstall -D fonts/* \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/fonts\n"; + print MK "\tinstall -d x3d \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/x3d\n"; + print MK "\tinstall -D x3d/* \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/x3d\n"; } else { - print MK "\tinstall -d \$(INSTALL_DIR)/freewrl/fonts\n"; - print MK "\tinstall fonts/*.ttf \$(INSTALL_DIR)/freewrl/fonts\n"; - print MK "\tinstall fonts/*.TXT \$(INSTALL_DIR)/freewrl/fonts\n"; - print MK "\tinstall fonts/*.conf \$(INSTALL_DIR)/freewrl/fonts\n"; - print MK "\tinstall -d \$(INSTALL_DIR)/freewrl/x3d\n"; - print MK "\tinstall x3d/*.dtd \$(INSTALL_DIR)/freewrl/x3d\n"; - print MK "\tinstall x3d/*.xslt \$(INSTALL_DIR)/freewrl/x3d\n"; + print MK "\tinstall -d \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/fonts\n"; + print MK "\tinstall fonts/*.ttf \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/fonts\n"; + print MK "\tinstall fonts/*.TXT \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/fonts\n"; + print MK "\tinstall fonts/*.conf \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/fonts\n"; + print MK "\tinstall -d \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/x3d\n"; + print MK "\tinstall x3d/*.dtd \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/x3d\n"; + print MK "\tinstall x3d/*.xslt \$(DESTDIR)/\$(INSTALL_DIR)/freewrl/x3d\n"; } }