aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2007-06-10 18:15:27 +0000
committerMax Horn2007-06-10 18:15:27 +0000
commite6383eb8c3383a9342f21d452d65b940548827ac (patch)
tree768a1abe0fd673958f6bdbf1eca6c8742920fd7e
parent7ac2361b2726764fae3259029b22b6be67041051 (diff)
downloadscummvm-rg350-e6383eb8c3383a9342f21d452d65b940548827ac.tar.gz
scummvm-rg350-e6383eb8c3383a9342f21d452d65b940548827ac.tar.bz2
scummvm-rg350-e6383eb8c3383a9342f21d452d65b940548827ac.zip
Added reference to COPYRIGHT file in various places
svn-id: r27325
-rw-r--r--Makefile5
-rw-r--r--Makefile.common2
-rw-r--r--backends/platform/gp2x/build/bundle.sh1
-rw-r--r--dists/redhat/scummvm.spec2
-rw-r--r--dists/redhat/scummvm.spec.in2
-rwxr-xr-xdists/slackware/scummvm.SlackBuild2
6 files changed, 9 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 1c0a65ac88..2a05d2f2a0 100644
--- a/Makefile
+++ b/Makefile
@@ -56,7 +56,7 @@ install: all
$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/pixmaps/"
$(INSTALL) -c -m 644 "$(srcdir)/icons/scummvm.xpm" "$(DESTDIR)$(PREFIX)/share/pixmaps/scummvm.xpm"
$(INSTALL) -d "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
- $(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/NEWS" "$(srcdir)/README" "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
+ $(INSTALL) -c -m 644 "$(srcdir)/AUTHORS" "$(srcdir)/COPYING" "$(srcdir)/COPYRIGHT" "$(srcdir)/NEWS" "$(srcdir)/README" "$(DESTDIR)$(PREFIX)/share/doc/scummvm/"
$(INSTALL) -d "$(DESTDIR)$(DATADIR)/scummvm/"
$(INSTALL) -c -m 644 "$(srcdir)/gui/themes/modern.ini" "$(srcdir)/gui/themes/modern.zip" "$(srcdir)/gui/themes/classic080.ini" "$(DESTDIR)$(DATADIR)/scummvm/"
@@ -136,6 +136,7 @@ osxsnap: bundle credits
mkdir ScummVM-snapshot
cp AUTHORS ./ScummVM-snapshot/Authors
cp COPYING ./ScummVM-snapshot/License
+ cp COPYRIGHT ./ScummVM-snapshot/Copyright\ Holders
cp NEWS ./ScummVM-snapshot/News
cp README ./ScummVM-snapshot/ScummVM\ ReadMe
/Developer/Tools/SetFile -t ttro -c ttxt ./ScummVM-snapshot/*
@@ -158,6 +159,7 @@ win32dist: scummvm$(EXEEXT)
cp gui/themes/modern.zip $(WIN32PATH)
cp AUTHORS $(WIN32PATH)/AUTHORS.txt
cp COPYING $(WIN32PATH)/COPYING.txt
+ cp COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt
cp NEWS $(WIN32PATH)/NEWS.txt
cp README $(WIN32PATH)/README.txt
cp /usr/local/README-SDL.txt $(WIN32PATH)
@@ -173,6 +175,7 @@ aos4dist: scummvm
cp gui/themes/modern.zip $(AOS4PATH)
cp AUTHORS $(AOS4PATH)/AUTHORS.txt
cp COPYING $(AOS4PATH)/COPYING.txt
+ cp COPYRIGHT $(AOS4PATH)/COPYRIGHT.txt
cp NEWS $(AOS4PATH)/NEWS.txt
cp README $(AOS4PATH)/README.txt
cp /sdk/local/documentation/SDL-1.2.9/README-SDL.txt $(AOS4PATH)
diff --git a/Makefile.common b/Makefile.common
index 1633921ea9..38106e74cd 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -15,7 +15,7 @@ all: $(EXECUTABLE) plugins
# Files that are to be included in the archive built by "make dist"
DISTFILES := \
Makefile Makefile.common \
- AUTHORS NEWS README COPYING
+ AUTHORS NEWS README COPYING COPYRIGHT
# The dist file name
ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip
diff --git a/backends/platform/gp2x/build/bundle.sh b/backends/platform/gp2x/build/bundle.sh
index b5e3161c9b..93ae45f0e3 100644
--- a/backends/platform/gp2x/build/bundle.sh
+++ b/backends/platform/gp2x/build/bundle.sh
@@ -23,6 +23,7 @@ cp ../../../../scummvm.gp2x ./scummvm-gp2x-`date '+%Y-%m-%d'`/
cp ../../../../AUTHORS ./scummvm-gp2x-`date '+%Y-%m-%d'`/
cp ../../../../README ./scummvm-gp2x-`date '+%Y-%m-%d'`/
cp ../../../../COPYING ./scummvm-gp2x-`date '+%Y-%m-%d'`/
+cp ../../../../COPYRIGHT ./scummvm-gp2x-`date '+%Y-%m-%d'`/
cp ../../../../NEWS ./scummvm-gp2x-`date '+%Y-%m-%d'`/
cp ../../../../gui/themes/modern.ini ./scummvm-gp2x-`date '+%Y-%m-%d'`/
cp ../../../../gui/themes/modern.zip ./scummvm-gp2x-`date '+%Y-%m-%d'`/
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 65fd9c9955..89804c1774 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -70,7 +70,7 @@ rm -Rf ${RPM_BUILD_ROOT}
#------------------------------------------------------------------------------
%files
%defattr(0644,root,root,0755)
-%doc AUTHORS README NEWS COPYING
+%doc AUTHORS README NEWS COPYING COPYRIGHT
%attr(0755,root,root)%{_bindir}/scummvm
%{_datadir}/applications/*
%{_datadir}/pixmaps/scummvm.xpm
diff --git a/dists/redhat/scummvm.spec.in b/dists/redhat/scummvm.spec.in
index f94f1116c9..65ba143219 100644
--- a/dists/redhat/scummvm.spec.in
+++ b/dists/redhat/scummvm.spec.in
@@ -70,7 +70,7 @@ rm -Rf ${RPM_BUILD_ROOT}
#------------------------------------------------------------------------------
%files
%defattr(0644,root,root,0755)
-%doc AUTHORS README NEWS COPYING
+%doc AUTHORS README NEWS COPYING COPYRIGHT
%attr(0755,root,root)%{_bindir}/scummvm
%{_datadir}/applications/*
%{_datadir}/pixmaps/scummvm.xpm
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index 579bb36e43..2d4d563062 100755
--- a/dists/slackware/scummvm.SlackBuild
+++ b/dists/slackware/scummvm.SlackBuild
@@ -38,7 +38,7 @@ gzip -9 dists/scummvm.6
mkdir -p $PKG/usr/man/man6
cp dists/scummvm.6.gz $PKG/usr/man/man6
mkdir -p $PKG/usr/doc/scummvm-$VERSION
-cp -a AUTHORS COPYING ChangeLog NEWS README TODO \
+cp -a AUTHORS COPYING COPYRIGHT ChangeLog NEWS README TODO \
$PKG/usr/doc/scummvm-$VERSION
chmod 644 $PKG/usr/doc/scummvm-$VERSION
mkdir -p $PKG/install