← Back to branch summary

~ubuntu-branches/ubuntu/natty/monodevelop/natty

« back to all changes in this revision

Viewing changes to src/addins/MonoDevelop.Autotools/Handler.cs

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Ebner
  • Date: 2008-03-29 23:36:33 UTC
  • mto: (1.5.1 sid)
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: james.westby@ubuntu.com-20080329233633-l550uuwvfh1e68at
Tags: upstream-1.0+dfsg
Import upstream version 1.0+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/MonoDevelop.Autotools/Handler.cs
153
153
                        string package_var = generateAutotools ? "@PACKAGE@" : "$(PACKAGE)";*/
154
154
                        //FIXME: Temp till we find a proper solution
155
155
                        string prefix_var = "@prefix@";
156
 
                        string package_var = "@PACKAGE@";
 
156
                        string package_var = "@PACKAGE@";
157
157
 
158
158
                        switch (folderId) {
159
159
                        case TargetDirectory.ProgramFilesRoot:
160
 
                                return prefix_var + "/lib";
 
160
                                return "@expanded_libdir@";
161
161
                        case TargetDirectory.ProgramFiles:
162
 
                                return prefix_var + "/lib/" + package_var;
 
162
                                return "@expanded_libdir@/" + package_var;
163
163
                        case TargetDirectory.Binaries:
164
 
                                return prefix_var + "/bin";
 
164
                                return "@expanded_bindir@";
165
165
                        case TargetDirectory.CommonApplicationDataRoot:
166
 
                                return prefix_var + "/share";
 
166
                                return "@expanded_datadir@";
167
167
                        case TargetDirectory.CommonApplicationData:
168
 
                                return prefix_var + "/share/" + package_var;
 
168
                                return "@expanded_datadir@/" + package_var;
169
169
                        case TargetDirectory.IncludeRoot:
170
170
                                return prefix_var + "/include";
171
171
                        case TargetDirectory.Include: