diff -ur arduino-svn/app/src/processing/app/debug/AvrdudeUploader.java arduino-0019/app/src/processing/app/debug/AvrdudeUploader.java
--- arduino-0019/app/src/processing/app/debug/AvrdudeUploader.java 2010-07-10 22:29:32.000000000 +0100
+++ app/src/processing/app/debug/AvrdudeUploader.java 2010-09-09 14:18:20.000000000 +0100
@@ -178,9 +178,7 @@
// Point avrdude at its config file since it's in a non-standard location.
if (Base.isLinux()) {
- // ???: is it better to have Linux users install avrdude themselves, in
- // a way that it can find its own configuration file?
- commandDownloader.add("-C" + Base.getHardwarePath() + "/tools/avrdude.conf");
+ commandDownloader.add("-C/etc/avrdude/avrdude.conf");
} else {
commandDownloader.add("-C" + Base.getHardwarePath() + "/tools/avr/etc/avrdude.conf");
}
diff -ur arduino-svn/app/src/processing/app/debug/Uploader.java arduino-0019/app/src/processing/app/debug/Uploader.java
--- arduino-0019/app/src/processing/app/debug/Uploader.java 2010-08-10 02:32:28.000000000 +0100
+++ app/src/processing/app/debug/Uploader.java 2010-09-09 14:17:10.000000000 +0100
@@ -113,7 +113,7 @@
String avrBasePath;
if(Base.isLinux()) {
- avrBasePath = new String(Base.getHardwarePath() + "/tools/");
+ avrBasePath = "/usr/bin/";
}
else {
avrBasePath = new String(Base.getHardwarePath() + "/tools/avr/bin/");