Skip to content

Commit a6ad405

Browse files
author
timlinux
committed
Correct the path used to find configure.in
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5153 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 29ab8f3 commit a6ad405

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

src/plugins/plugin_builder.pl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@
7575
#
7676
# create the new plugin directory
7777
system("cp -r plugin_template $pluginDir");
78+
# remove the README file
79+
system("rm -rf $pluginDir/README");
7880
# remove the subversion directory
7981
system("rm -rf $pluginDir/.svn");
8082
# copy files to appropriate names
@@ -128,8 +130,8 @@
128130
# Add an entry to qgis/configure.in
129131
# Do we really want to do this or add a message telling the user how to do
130132
# it?
131-
open CONFIGUREIN, "<../configure.in" || die 'Unable to open ../configure.in';
132-
open CONFIGUREINMOD, ">../configure.in.mod" || die 'Unable to create ../configure.in.mod';
133+
open CONFIGUREIN, "<../../configure.in" || die 'Unable to open ../../configure.in';
134+
open CONFIGUREINMOD, ">../../configure.in.mod" || die 'Unable to create ../../configure.in.mod';
133135
# read through configure.in until we find the AC_CONFIG_FILES section
134136
while(<CONFIGUREIN>){
135137
if(/^\s*AC_CONFIG_FILES*/){
@@ -152,11 +154,11 @@
152154
close CONFIGUREINMOD;
153155

154156
# save configure.in in case we die before done moving things around
155-
system("mv ../configure.in ../configure.in.save");
157+
system("mv ../../configure.in ../../configure.in.save");
156158
# move the new configure.in to where it belongs
157-
system("mv ../configure.in.mod ../configure.in");
159+
system("mv ../../configure.in.mod ../../configure.in");
158160
# delete the original configure.in
159-
unlink("../configure.in.save");
161+
unlink("../../configure.in.save");
160162

161163
# print out some end of processing info
162164
print << "EOP";

0 commit comments

Comments
 (0)