aboutsummaryrefslogtreecommitdiff
blob: a9d6a2b278ebcbaf96c0afa5ed7be6552ae55616 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
--- /tmp/DVDStyler-1.7.4/./src/Makefile.am	2009-09-04 15:49:32.000000000 +1000
+++ ./src/Makefile.am	2009-10-14 15:34:46.000000000 +1100
@@ -7,7 +7,7 @@
  VobListBox.cpp TitlePropDlg.cpp TitlesetManager.cpp\
  BurnDlg.cpp ProgressDlg.cpp DirCtrl.cpp StatusBar.cpp MainWin.cpp dvdstyler.cpp
 
-CXXFLAGS = @CXXFLAGS@ -I..
+AM_CXXFLAGS = @CXXFLAGS@ -I..
 LDADD = ../wxVillaLib/libwxvilla.a
 
 SUBDIRS = rc
--- /tmp/DVDStyler-1.7.4/./Makefile.am	2008-07-15 07:58:46.000000000 +1000
+++ ./Makefile.am	2009-10-14 15:23:26.000000000 +1100
@@ -1,6 +1,5 @@
 SUBDIRS = wxVillaLib src locale backgrounds buttons objects data docs
 ACLOCAL_AMFLAGS=-I.
-pkgdatadir=@datadir@/doc/@PACKAGE@
-pkgdata_DATA = AUTHORS COPYING INSTALL README ChangeLog
+doc_DATA = AUTHORS COPYING INSTALL README ChangeLog
 run: all
 	$(MAKE) -C src run
--- /tmp/DVDStyler-1.7.4/./wxVillaLib/Makefile.am	2007-12-31 09:51:35.000000000 +1100
+++ ./wxVillaLib/Makefile.am	2009-10-14 15:35:32.000000000 +1100
@@ -3,4 +3,4 @@
  PipeExecute.cpp PropDlg.cpp SConv.cpp\
  Thumbnails.cpp ThumbnailFactory.cpp\
  utils.cpp VerticalToolbar.cpp
-CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@ @LIBEXIF_CFLAGS@ -DWX_SVG
+AM_CXXFLAGS = @CXXFLAGS@ @GNOMEUI2_CFLAGS@ @LIBEXIF_CFLAGS@ -DWX_SVG
--- /tmp/DVDStyler-1.7.4/locale/Makefile.in	2009-09-19 18:46:38.000000000 +1000
+++ locale/Makefile.in	2009-10-14 15:46:49.000000000 +1100
@@ -4,8 +4,10 @@
 # building lang.mo files from the translated lang.po catalogs.
 
 PROGNAME=dvdstyler
-LINGUAS=cs da de el es eu fr hu it ko mk nl pl pt pt_BR ru sk sl sr sv vi zh_TW
-LINGUAS_ALL=ca cs da de el es eu fr hu it ja ko mk nl pl pt pt_BR ru sk sl sr sv vi zh_TW
+# ls *.po | cut -f1 -d . | xargs echo  >> Makefile.in          
+LINGUAS=cs da de el es fr it ko mk pl pt pt_BR ru sl sr vi zh_TW
+LINGUAS_ALL=cs da de el es fr it ko mk pl pt pt_BR ru sl sr vi zh_TW
+
 
 prefix=@prefix@
 datarootdir=@datarootdir@
--- /tmp/DVDStyler-1.7.4/docs/Makefile.am	2009-08-30 00:30:10.000000000 +1000
+++ docs/Makefile.am	2009-10-14 16:08:10.000000000 +1100
@@ -1,22 +1,19 @@
-pkgdatadir=@datadir@/man/man1
-pkgdata_DATA = dvdstyler.1
+dist_man_MANS = dvdstyler.1
 
 LINGUAS=en de
-docdir=@datadir@/@PACKAGE@/docs
 doc_DATA = $(LINGUAS:%=help_%.zip)
 
 help%.zip: DVDStylerGuide%.xml
-	mkdir temp
-	(cd temp && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide$*.xml && rm -f *.hh* && $(ZIP) ../help$*.zip *.html)
-	rm -f temp/*.html
-	rmdir temp
+	t=`mktemp -d tempXXXXXXX`; \
+	(cd "$$t" && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide$*.xml && rm -f *.hh* && $(ZIP) ../help$*.zip *.html) ; \
+	rm -f "$$t"/*.html ; \
+	rmdir "$$t"
 	$(ZIP) help$*.zip htmlhelp.hhp toc.hhc images/*.png
 
 html: $(LINGUAS:%=html_%)
 
 html%: DVDStylerGuide%.xml
-	rm -rf html$*
-	mkdir html$*
-	(cd html$* && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide$*.xml && rm -f *.hh*)
-	mkdir html$*/images
+	t=`mktemp -d htmlXXXXXX` ; \
+	(cd "$$t" && $(XMLTO) --skip-validation htmlhelp ../DVDStylerGuide$*.xml && rm -f *.hh*) ; \
+	mkdir "$$t"/images
 	cp images/*.png html$*/images/