diff options
author | benpicco <[email protected]> | 2013-02-19 08:46:56 -0800 |
---|---|---|
committer | benpicco <[email protected]> | 2013-02-19 08:46:56 -0800 |
commit | 204631ae053ad91bdb7149f29c5289cab4347eb3 (patch) | |
tree | c94358f3f4710fc1af6f1b091871ee4413e66153 /Makefile.am | |
parent | c096075b4b45d0c0c688a1ba5f69037a7290847a (diff) | |
parent | 6740ac44bab322adf290bfdb10244d1c9a8aae55 (diff) | |
download | caja-dropbox-204631ae053ad91bdb7149f29c5289cab4347eb3.tar.bz2 caja-dropbox-204631ae053ad91bdb7149f29c5289cab4347eb3.tar.xz |
Merge pull request #2 from hillwoodroc/master
Fix files conflict with nautilus-dropbox
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index bd79291..7f72814 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,16 +1,16 @@ AUTOMAKE_OPTIONS = dist-bzip2 no-dist-gzip -bin_SCRIPTS = dropbox -CLEANFILES = $(bin_SCRIPTS) dropbox.1 dropbox.txt -EXTRA_DIST = dropbox.in serializeimages.py dropbox.txt.in docgen.py rst2man.py -man_MANS = dropbox.1 +bin_SCRIPTS = caja-dropbox +CLEANFILES = $(bin_SCRIPTS) caja-dropbox.1 caja-dropbox.txt +EXTRA_DIST = caja-dropbox.in serializeimages.py caja-dropbox.txt.in docgen.py rst2man.py +man_MANS = caja-dropbox.1 -dropbox: dropbox.in serializeimages.py - python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox - chmod +x dropbox +caja-dropbox: caja-dropbox.in serializeimages.py + python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < caja-dropbox.in > caja-dropbox + chmod +x caja-dropbox -dropbox.1: dropbox.txt.in dropbox docgen.py - python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt - $(RST2MAN) dropbox.txt > dropbox.1 +caja-dropbox.1: caja-dropbox.txt.in caja-dropbox docgen.py + python docgen.py $(PACKAGE_VERSION) < caja-dropbox.txt.in > caja-dropbox.txt + $(RST2MAN) caja-dropbox.txt > caja-dropbox.1 SUBDIRS = data src |