| 1 |
binki 11/07/27 15:11:37 |
| 2 |
|
| 3 |
Added: atheme-services-7.0.0_alpha6-destdir-perl.patch |
| 4 |
Log: |
| 5 |
Bump to atheme-7.0.0_alpha6 which has perl scripting support. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha46-r1/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 net-irc/atheme-services/files/atheme-services-7.0.0_alpha6-destdir-perl.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/atheme-services/files/atheme-services-7.0.0_alpha6-destdir-perl.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/atheme-services/files/atheme-services-7.0.0_alpha6-destdir-perl.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: atheme-services-7.0.0_alpha6-destdir-perl.patch |
| 16 |
=================================================================== |
| 17 |
diff --git a/modules/scripting/perl/Makefile b/modules/scripting/perl/Makefile |
| 18 |
index ec006ba..b7e4dbd 100644 |
| 19 |
--- a/modules/scripting/perl/Makefile |
| 20 |
+++ b/modules/scripting/perl/Makefile |
| 21 |
@@ -12,7 +12,7 @@ include ../../../buildsys.mk |
| 22 |
|
| 23 |
plugindir = $(MODDIR)/modules/scripting |
| 24 |
|
| 25 |
-CPPFLAGS += -I../../../include -I. $(PERL_CFLAGS) |
| 26 |
+CPPFLAGS += -I../../../include -I. $(PERL_CFLAGS) -DPERL_MODDIR='"$(plugindir)"' |
| 27 |
CFLAGS += $(PLUGIN_CFLAGS) |
| 28 |
LDFLAGS += $(PLUGIN_LDFLAGS) $(PERL_LIBS) |
| 29 |
LIBS += -L../../../libathemecore -lathemecore ${LDFLAGS_RPATH} |
| 30 |
@@ -28,11 +28,11 @@ perlxsi.c: |
| 31 |
perl -MExtUtils::Embed -e xsinit |
| 32 |
|
| 33 |
install-extra: |
| 34 |
- ${MKDIR_P} ${plugindir}/lib |
| 35 |
- ${INSTALL} -m644 lib/*.pl lib/*.pm ${plugindir}/lib |
| 36 |
- ${MKDIR_P} ${plugindir}/lib/Atheme |
| 37 |
- ${INSTALL} -m644 lib/Atheme/*.pm ${plugindir}/lib/Atheme |
| 38 |
- ${MKDIR_P} ${plugindir}/lib/Atheme/Internal |
| 39 |
- ${INSTALL} -m644 lib/Atheme/Internal/*.pm ${plugindir}/lib/Atheme/Internal |
| 40 |
- ${MKDIR_P} ${plugindir}/examples |
| 41 |
- ${INSTALL} -m644 examples/*.pl ${plugindir}/examples |
| 42 |
+ ${MKDIR_P} '${DESTDIR}'${plugindir}/lib |
| 43 |
+ ${INSTALL} -m644 lib/*.pl lib/*.pm '${DESTDIR}'${plugindir}/lib |
| 44 |
+ ${MKDIR_P} '${DESTDIR}'${plugindir}/lib/Atheme |
| 45 |
+ ${INSTALL} -m644 lib/Atheme/*.pm '${DESTDIR}'${plugindir}/lib/Atheme |
| 46 |
+ ${MKDIR_P} '${DESTDIR}'${plugindir}/lib/Atheme/Internal |
| 47 |
+ ${INSTALL} -m644 lib/Atheme/Internal/*.pm '${DESTDIR}'${plugindir}/lib/Atheme/Internal |
| 48 |
+ ${MKDIR_P} '${DESTDIR}'${plugindir}/examples |
| 49 |
+ ${INSTALL} -m644 examples/*.pl '${DESTDIR}'${plugindir}/examples |
| 50 |
diff --git a/modules/scripting/perl/perl_module.c b/modules/scripting/perl/perl_module.c |
| 51 |
index ba93cdf..dfa8622 100644 |
| 52 |
--- a/modules/scripting/perl/perl_module.c |
| 53 |
+++ b/modules/scripting/perl/perl_module.c |
| 54 |
@@ -24,7 +24,7 @@ DECLARE_MODULE_V1 |
| 55 |
* Definitions: |
| 56 |
* PERL_INIT_FILE is the perl script that is used to boot the Atheme interface. |
| 57 |
*/ |
| 58 |
-#define PERL_INIT_FILE PREFIX "/modules/scripting/lib/init.pl" |
| 59 |
+#define PERL_INIT_FILE PERL_MODDIR "/lib/init.pl" |
| 60 |
|
| 61 |
/* |
| 62 |
* External functions: |
Archives