From e94bcdd9eaedd3db5a442a0ddd37318265772d06 Mon Sep 17 00:00:00 2001 From: RjY Date: Tue, 14 Mar 2017 11:43:33 +0000 Subject: [PATCH] graphics/titlepic: remove author subdirectory - move captainw/* into titlepic (rename fdmtitle to freedm_titlepic) - fix file paths in dist/Makefile, graphics/titlepic/Makefile --- dist/Makefile | 2 +- graphics/titlepic/Makefile | 4 ++-- graphics/{captainw => titlepic}/freedm_title.png | Bin graphics/{captainw => titlepic}/freedm_title2.png | Bin .../fdmtitle.gif => titlepic/freedm_titlepic.gif} | Bin 5 files changed, 3 insertions(+), 3 deletions(-) rename graphics/{captainw => titlepic}/freedm_title.png (100%) rename graphics/{captainw => titlepic}/freedm_title2.png (100%) rename graphics/{captainw/fdmtitle.gif => titlepic/freedm_titlepic.gif} (100%) diff --git a/dist/Makefile b/dist/Makefile index 08f98ff7..acc4e7c9 100644 --- a/dist/Makefile +++ b/dist/Makefile @@ -3,7 +3,7 @@ man-%: freedoom.adoc a2x -f manpage $*.adoc icon-freedm: - convert -resize 64x64 ../graphics/captainw/freedm_title2.png \ + convert -resize 64x64 ../graphics/titlepic/freedm_title2.png \ freedm.png icon-freedoom1: diff --git a/graphics/titlepic/Makefile b/graphics/titlepic/Makefile index bb03f6e4..6b6325e1 100644 --- a/graphics/titlepic/Makefile +++ b/graphics/titlepic/Makefile @@ -14,8 +14,8 @@ fd2title.gif: titlepic.gif m_doom.gif ./create_caption titlepic.gif m_doom.gif "Phase 2" $@ cp $@ ../ -fdmtitle.gif: ../captainw/fdmtitle.gif - ./create_caption ../captainw/fdmtitle.gif $@ +fdmtitle.gif: freedm_titlepic.gif + ./create_caption $< $@ cp $@ ../ clean: diff --git a/graphics/captainw/freedm_title.png b/graphics/titlepic/freedm_title.png similarity index 100% rename from graphics/captainw/freedm_title.png rename to graphics/titlepic/freedm_title.png diff --git a/graphics/captainw/freedm_title2.png b/graphics/titlepic/freedm_title2.png similarity index 100% rename from graphics/captainw/freedm_title2.png rename to graphics/titlepic/freedm_title2.png diff --git a/graphics/captainw/fdmtitle.gif b/graphics/titlepic/freedm_titlepic.gif similarity index 100% rename from graphics/captainw/fdmtitle.gif rename to graphics/titlepic/freedm_titlepic.gif