diff options
| author | Stefano Karapetsas <[email protected]> | 2013-06-26 05:10:33 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-06-26 05:10:33 -0700 |
| commit | 7907b525b6eb6e848f4843fbd12577821f9a49de (patch) | |
| tree | 321249f896ffb05e4a0bd4c74310469eafe15b72 | |
| parent | 27da3a4c4e398d9a0eca099e9da6e8d742b0612f (diff) | |
| parent | e19b15358829cc77bd9e13013722bcadb5e7e450 (diff) | |
| download | caja-dropbox-7907b525b6eb6e848f4843fbd12577821f9a49de.tar.bz2 caja-dropbox-7907b525b6eb6e848f4843fbd12577821f9a49de.tar.xz | |
Merge pull request #6 from NiceandGently/master
fix automake-1.13 deprecations
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac (renamed from configure.in) | 2 | ||||
| -rw-r--r-- | serializeimages.py | 4 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=. PKG_NAME="caja-dropbox" -(test -f $srcdir/configure.in) || { +(test -f $srcdir/configure.ac) || { echo -n "**Error**: Directory "\`$srcdir\'" does not look like the" echo " top-level $PKG_NAME directory" exit 1 diff --git a/configure.in b/configure.ac index 5bb3250..71ababa 100644 --- a/configure.in +++ b/configure.ac @@ -2,7 +2,7 @@ AC_INIT([caja-dropbox], 0.7.1) -AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) +AM_INIT_AUTOMAKE AC_PREFIX_DEFAULT(/usr) diff --git a/serializeimages.py b/serializeimages.py index 26427d4..0adcd98 100644 --- a/serializeimages.py +++ b/serializeimages.py @@ -11,8 +11,8 @@ def replace_many(src2dest, buf): return src_re.sub(replace_repl, buf) if __name__ == '__main__': - pixbuf64 = gtk.gdk.pixbuf_new_from_file("data/icons/hicolor/64x64/apps/dropbox.png") - pixbuf16 = gtk.gdk.pixbuf_new_from_file("data/icons/hicolor/16x16/apps/dropbox.png") + pixbuf64 = gtk.gdk.pixbuf_new_from_file("data/icons/hicolor/64x64/apps/caja-dropbox.png") + pixbuf16 = gtk.gdk.pixbuf_new_from_file("data/icons/hicolor/16x16/apps/caja-dropbox.png") src2dest = {'@PACKAGE_VERSION@': sys.argv[1], '@DESKTOP_FILE_DIR@': sys.argv[2], '@IMAGEDATA64@': ("gtk.gdk.pixbuf_new_from_data(%r, gtk.gdk.COLORSPACE_RGB, %r, %r, %r, %r, %r)" % diff --git a/src/Makefile.am b/src/Makefile.am index 016ecb9..9c405de 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = \ +AM_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_builddir) |