Merge lp:~tetromino/simple-scan/mkdir_p into lp:simple-scan

Proposed by Alexandre Rostovtsev on 2012-07-17
Status: Merged
Merged at revision: 592
Proposed branch: lp:~tetromino/simple-scan/mkdir_p
Merge into: lp:simple-scan
Diff against target: 11 lines (+1/-1) 1 file modified
To merge this branch: bzr merge lp:~tetromino/simple-scan/mkdir_p
Reviewer Review Type Date Requested Status
Simple Scan Development Team 2012-07-17 Pending
Review via email: mp+115284@code.launchpad.net

Description of the Change

The $(mkdir_p) make variable is considered obsolete since automake-1.10, and will probably be removed in a future automake version.

To post a comment you must log in.
Robert Ancell (robert-ancell) wrote :

Thanks Alexandre

Preview Diff

1=== modified file 'data/icons/Makefile.am'
2--- data/icons/Makefile.am 2010-03-27 02:09:20 +0000
3+++ data/icons/Makefile.am 2012-07-17 07:24:38 +0000
4@@ -12,7 +12,7 @@
5 CONTEXT=`echo $$icon | cut -d_ -f2`; \
6 SIZE=`echo $$icon | cut -d_ -f3`; \
7 ICONFILE=`echo $$icon | cut -d_ -f4`; \
8- $(mkdir_p) $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
9+ $(MKDIR_P) $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
10 $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(pkgdatadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
11 done
12

Subscribers

People subscribed via source and target branches