summary refs log tree commit diff stats
path: root/plugins/perl
diff options
context:
space:
mode:
authorberkeviktor@aol.com <berkeviktor@aol.com>2010-11-12 04:11:27 +0100
committerberkeviktor@aol.com <berkeviktor@aol.com>2010-11-12 04:11:27 +0100
commitf98ac35d9ee1b86245efe70b8161724be1af16ea (patch)
tree6193e2ca9d5c6a8ccfe8c92bde992046a0dc9bf0 /plugins/perl
parent9cbe171fd9e1634ea91423d9f52b299705ee98d7 (diff)
restrict use of absolute paths as much as possible
Diffstat (limited to 'plugins/perl')
-rw-r--r--plugins/perl/makefile-510.mak10
-rw-r--r--plugins/perl/makefile-512.mak10
2 files changed, 4 insertions, 16 deletions
diff --git a/plugins/perl/makefile-510.mak b/plugins/perl/makefile-510.mak
index f407eadb..a91587d2 100644
--- a/plugins/perl/makefile-510.mak
+++ b/plugins/perl/makefile-510.mak
@@ -3,12 +3,6 @@ include "..\..\src\makeinc.mak"
 TARGET = xcperl-510.dll
 PERLLIB = perl510
 
-!ifdef X64
-PERLPATH = c:\mozilla-build\perl-5.10-x64\lib\CORE
-!else
-PERLPATH = c:\mozilla-build\perl-5.10-x86\lib\CORE
-!endif
-
 all: $(TARGET)
 
 perl.def:
@@ -18,7 +12,7 @@ perl.def:
 	echo xchat_plugin_get_info >> perl.def
 
 perl.obj: perl.c
-	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERLPATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\"
+	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL510PATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\"
 
 perl.c: xchat.pm.h
 
@@ -26,7 +20,7 @@ xchat.pm.h: Xchat.pm IRC.pm
 	perl.exe generate_header
 
 $(TARGET): perl.obj perl.def
-	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERLLIB).lib /libpath:$(PERLPATH) /DELAYLOAD:$(PERLLIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
+	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERLLIB).lib /libpath:$(PERL510PATH) /DELAYLOAD:$(PERLLIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
 
 clean:
 	@del $(TARGET)
diff --git a/plugins/perl/makefile-512.mak b/plugins/perl/makefile-512.mak
index 523c1dcf..2ef298d8 100644
--- a/plugins/perl/makefile-512.mak
+++ b/plugins/perl/makefile-512.mak
@@ -3,12 +3,6 @@ include "..\..\src\makeinc.mak"
 TARGET = xcperl-512.dll
 PERLLIB = perl512
 
-!ifdef X64
-PERLPATH = c:\mozilla-build\perl-5.12-x64\lib\CORE
-!else
-PERLPATH = c:\mozilla-build\perl-5.12-x86\lib\CORE
-!endif
-
 all: $(TARGET)
 
 perl.def:
@@ -18,7 +12,7 @@ perl.def:
 	echo xchat_plugin_get_info >> perl.def
 
 perl.obj: perl.c
-	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERLPATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\"
+	$(CC) $(CFLAGS) perl.c $(GLIB) /I$(PERL512PATH) /I.. /DPERL_DLL=\"$(PERLLIB).dll\"
 
 perl.c: xchat.pm.h
 
@@ -26,7 +20,7 @@ xchat.pm.h: Xchat.pm IRC.pm
 	perl.exe generate_header
 
 $(TARGET): perl.obj perl.def
-	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERLLIB).lib /libpath:$(PERLPATH) /DELAYLOAD:$(PERLLIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
+	$(LINK) /DLL /out:$(TARGET) perl.obj $(LDFLAGS) $(PERLLIB).lib /libpath:$(PERL512PATH) /DELAYLOAD:$(PERLLIB).dll DELAYIMP.LIB user32.lib shell32.lib advapi32.lib /def:perl.def
 
 clean:
 	@del $(TARGET)